| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py
|
| index d7d4445f226ee3e8812c78b0d64081532556ba34..73410ed9225046a17988db1e7aa2e8e047bbcd2d 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py
|
| @@ -26,12 +26,10 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -
|
| from webkitpy.layout_tests.models import test_expectations
|
|
|
| from webkitpy.common.net import layouttestresults
|
|
|
| -
|
| TestExpectations = test_expectations.TestExpectations
|
| TestExpectationParser = test_expectations.TestExpectationParser
|
|
|
| @@ -68,14 +66,13 @@ class BuildBotPrinter(object):
|
| self._print("")
|
| # FIXME: We should be skipping anything marked WONTFIX, so we shouldn't bother logging these stats.
|
| self._print_run_results_entry(run_results, test_expectations.WONTFIX,
|
| - "Tests that will only be fixed if they crash (WONTFIX)")
|
| + "Tests that will only be fixed if they crash (WONTFIX)")
|
| self._print("")
|
|
|
| def _print_run_results_entry(self, run_results, timeline, heading):
|
| total = len(run_results.tests_by_timeline[timeline])
|
| - not_passing = (total -
|
| - len(run_results.tests_by_expectation[test_expectations.PASS] &
|
| - run_results.tests_by_timeline[timeline]))
|
| + not_passing = (
|
| + total - len(run_results.tests_by_expectation[test_expectations.PASS] & run_results.tests_by_timeline[timeline]))
|
| self._print("=> %s (%d):" % (heading, not_passing))
|
|
|
| for result in TestExpectations.EXPECTATION_DESCRIPTIONS.keys():
|
| @@ -143,7 +140,8 @@ class BuildBotPrinter(object):
|
| actual = result['actual'].split(" ")
|
| expected = result['expected'].split(" ")
|
| # FIXME: clean this up once the old syntax is gone
|
| - new_expectations_list = [TestExpectationParser._inverted_expectation_tokens[exp] for exp in list(set(actual) | set(expected))]
|
| + new_expectations_list = [TestExpectationParser._inverted_expectation_tokens[exp]
|
| + for exp in list(set(actual) | set(expected))]
|
| self._print(" %s [ %s ]" % (test, " ".join(new_expectations_list)))
|
| self._print("")
|
| self._print("")
|
|
|