Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(479)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations.py

Issue 2298183005: Fix deps_updater.py to use 'origin/master' instead of 'master' (Closed)
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """A class for updating layout test expectations when updating w3c tests. 5 """A class for updating layout test expectations when updating w3c tests.
6 6
7 Specifically, this class fetches results from try bots for the current CL, and: 7 Specifically, this class fetches results from try bots for the current CL, and:
8 1. Downloads new baseline files for any tests that can be rebaselined. 8 1. Downloads new baseline files for any tests that can be rebaselined.
9 2. Updates the generic TestExpectations file for any other failing tests. 9 2. Updates the generic TestExpectations file for any other failing tests.
10 10
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 failure test dictionary. 286 failure test dictionary.
287 287
288 Args: 288 Args:
289 tests_results: A dict mapping test name to platform to test results. 289 tests_results: A dict mapping test name to platform to test results.
290 290
291 Returns: 291 Returns:
292 An updated tests_results dictionary without the platform-specific 292 An updated tests_results dictionary without the platform-specific
293 testharness.js tests that required new baselines to be downloaded 293 testharness.js tests that required new baselines to be downloaded
294 from `webkit-patch rebaseline-from-try-jobs`. 294 from `webkit-patch rebaseline-from-try-jobs`.
295 """ 295 """
296 modified_files = self.host.executive.run_command(['git', 'diff', 'master ', '--name-only']).splitlines() 296 modified_files = self.host.executive.run_command(['git', 'diff', 'origin /master', '--name-only']).splitlines()
297 tests_to_rebaseline, tests_results = self.get_tests_to_rebaseline(modifi ed_files, tests_results) 297 tests_to_rebaseline, tests_results = self.get_tests_to_rebaseline(modifi ed_files, tests_results)
298 if tests_to_rebaseline: 298 if tests_to_rebaseline:
299 webkit_patch = self.host.filesystem.join( 299 webkit_patch = self.host.filesystem.join(
300 self.finder.chromium_base(), self.finder.webkit_base(), self.fin der.path_to_script('webkit-patch')) 300 self.finder.chromium_base(), self.finder.webkit_base(), self.fin der.path_to_script('webkit-patch'))
301 self.host.executive.run_command([ 301 self.host.executive.run_command([
302 'python', 302 'python',
303 webkit_patch, 303 webkit_patch,
304 'rebaseline-cl', 304 'rebaseline-cl',
305 '--verbose', 305 '--verbose',
306 '--no-trigger-jobs', 306 '--no-trigger-jobs',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 343
344 Args: 344 Args:
345 test_path: A file path relative to the layout tests directory. 345 test_path: A file path relative to the layout tests directory.
346 This might correspond to a deleted file or a non-test. 346 This might correspond to a deleted file or a non-test.
347 """ 347 """
348 absolute_path = self.host.filesystem.join(self.finder.layout_tests_dir() , test_path) 348 absolute_path = self.host.filesystem.join(self.finder.layout_tests_dir() , test_path)
349 test_parser = TestParser(absolute_path, self.host) 349 test_parser = TestParser(absolute_path, self.host)
350 if not test_parser.test_doc: 350 if not test_parser.test_doc:
351 return False 351 return False
352 return test_parser.is_jstest() 352 return test_parser.is_jstest()
OLDNEW
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698