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

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

Issue 2176223002: Call update-w3c-test-expectations in deps_updater.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 31b7500f5dec870bbfbad27f5f7ad7b273f443e0..96834fd39b5f863eb5dda09a502705a1ea098b84 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
@@ -63,19 +63,33 @@ class DepsUpdater(object):
raise AssertionError("Unsupported target %s" % self.target)
self.commit_changes_if_needed(chromium_commitish, import_commitish)
-
+ # TODO(dcampb): Change try bots to run when new try bots are added.
if self.auto_update:
- self.check_run(['git', 'cl', 'upload', '-f'])
dcampb 2016/07/25 17:09:27 note, this flag uploads a cl even if no new test
- self.run(['git', 'cl', 'set-commit', '--dry-run'])
+ self.print_('## Uploading change list.')
+ self.check_run(['git', 'cl', 'upload', '-f', '-m', 'W3C auto test importer'])
+ self.print_('## Triggering try jobs.')
+ self.run(['git', 'cl', 'try', '-b', 'linux_chromium_rel_ng'])
+ self.run(['git', 'cl', 'try', '-b', 'mac_chromium_rel_ng'])
+ self.run(['git', 'cl', 'try', '-b', 'win_chromium_rel_ng'])
qyearsley 2016/07/25 21:57:34 As mentioned in person, we will want to get the li
dcampb 2016/07/26 21:18:10 done
+ self.print_('## Waiting for Try Job Results')
+ has_failing_results = False
while True:
time.sleep(POLL_DELAY_SECONDS)
_, out = self.run(['git', 'cl', 'try-results'])
results = self.parse_try_job_results(out)
- if results['Started'] or results['Scheduled']:
+ if results.get('Started') or results.get('Scheduled'):
continue
- if results['Failures']:
- return 1
+ if results.get('Failures'):
+ has_failing_results = True
break
+ if has_failing_results:
+ self.print_('## 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])
dcampb 2016/07/25 17:09:27 This will add lines to Test Expectations IF the te
qyearsley 2016/07/25 21:57:34 Seems like it should only ever add tests that were
dcampb 2016/07/26 21:18:09 Fixed only adding new imported test. See issue #:2
+ self.check_run(['git', 'commit', '-a', '-m', '\'Modified Test Expectations from W3C_Test_AutoRoller\''])
qyearsley 2016/07/25 21:57:34 W3C_Test_Autoroller -> W3C Test Auto-roller?
dcampb 2016/07/26 21:18:09 done
+ self.check_run(['git', 'cl', 'upload', '-m', '\'Wrote lines to Test Expectations\''])
qyearsley 2016/07/25 21:57:34 Test Expectations -> TestExpectations
dcampb 2016/07/26 21:18:09 done
+ else:
+ self.print_('No Failures, committing patch.')
self.run(['git', 'cl', 'land', '-f'])
return 0
@@ -281,9 +295,6 @@ class DepsUpdater(object):
break
else:
sets[result_type].add(line.split()[0])
- sets['Failures'] -= sets['Successes']
- sets['Started'] -= sets['Successes']
- sets['Started'] -= sets['Failures']
return sets
def check_run(self, command):
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698