| Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
|
| index a839640a6f5912dd2947b0f551dd50b8b11d8f35..a1d3d9663a9a07ee6be03315859c51c2e5de5c8d 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
|
| @@ -23,6 +23,7 @@ import re
|
| from webkitpy.common.net.git_cl import GitCL
|
| from webkitpy.common.webkit_finder import WebKitFinder
|
| from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
|
| +from webkitpy.w3c.update_w3c_test_expectations import W3CExpectationsLineAdder
|
| from webkitpy.w3c.test_importer import TestImporter
|
| from webkitpy.w3c.common import WPT_REPO_URL, CSS_REPO_URL, WPT_DEST_NAME, CSS_DEST_NAME
|
|
|
| @@ -400,9 +401,9 @@ class DepsUpdater(object):
|
| def fetch_new_expectations_and_baselines(self):
|
| """Adds new expectations and downloads baselines based on try job results, then commits and uploads the change."""
|
| _log.info('Adding test expectations lines to LayoutTests/TestExpectations.')
|
| - script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c-test-expectations')
|
| - self.run([self.host.executable, script_path, '--verbose'])
|
| - message = 'Modify TestExpectations or download new baselines for tests.'
|
| + line_adder = W3CExpectationsLineAdder(self.host)
|
| + line_adder.run()
|
| + message = 'Update test expectations and baselines.'
|
| self.check_run(['git', 'commit', '-a', '-m', message])
|
| self.git_cl.run(['upload', '-m', message, '--rietveld'])
|
|
|
| @@ -410,7 +411,6 @@ class DepsUpdater(object):
|
| """Updates all test expectations files for tests that have been deleted or renamed."""
|
| port = self.host.port_factory.get()
|
| for path, file_contents in port.all_expectations_dict().iteritems():
|
| -
|
| parser = TestExpectationParser(port, all_tests=None, is_lint_mode=False)
|
| expectation_lines = parser.parse(path, file_contents)
|
| self._update_single_test_expectations_file(path, expectation_lines, deleted_tests, renamed_tests)
|
|
|