| 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 3792a30edd40231be53c01ee0538f5fb80a5746d..068eed30ea0ee3b36917ac45c6bfa2c2cb9863be 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
|
| @@ -28,14 +28,11 @@
|
|
|
|
|
| from webkitpy.layout_tests.models import test_expectations
|
| +from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationLine
|
|
|
| from webkitpy.common.net.layouttestresults import LayoutTestResults
|
|
|
|
|
| -TestExpectations = test_expectations.TestExpectations
|
| -TestExpectationParser = test_expectations.TestExpectationParser
|
| -
|
| -
|
| class BuildBotPrinter(object):
|
| # This output is parsed by buildbots and must only be changed in coordination with buildbot scripts (see webkit.org's
|
| # Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg: RunWebKitTests._parseNewRunWebKitTestsOutput
|
| @@ -145,7 +142,7 @@ class BuildBotPrinter(object):
|
| actual = result.actual_results().split(" ")
|
| expected = result.expected_results().split(" ")
|
| # FIXME: clean this up once the old syntax is gone
|
| - new_expectations_list = [TestExpectationParser._inverted_expectation_tokens[exp]
|
| + new_expectations_list = [TestExpectationLine.inverted_expectation_tokens[exp]
|
| for exp in list(set(actual) | set(expected))]
|
| self._print(" %s [ %s ]" % (test, " ".join(new_expectations_list)))
|
| self._print("")
|
| @@ -161,7 +158,7 @@ class BuildBotPrinter(object):
|
| result = test_results.result_for_test(test)
|
| actual = result.actual_results().split(" ")
|
| expected = result.expected_results().split(" ")
|
| - new_expectations_list = [TestExpectationParser._inverted_expectation_tokens[exp] for exp in actual]
|
| + new_expectations_list = [TestExpectationLine.inverted_expectation_tokens[exp] for exp in actual]
|
| self._print(" %s [ %s ]" % (test, " ".join(new_expectations_list)))
|
| self._print("")
|
|
|
|
|