In deps_updater.py: After updating, set commit and close on CQ failure.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Pull latest revisions of a W3C test repo and make a local commit."""
 
 import argparse
 import json
 import time
 
@@ skipping 64 matching lines @@
             email_list = self.generate_email_list(out, directory_dict)
             self.print_('## Uploading change list.')
             self.check_run(self.generate_upload_command(email_list))
             self.print_('## Triggering try jobs.')
             for try_bot in try_bots:
                 self.run(['git', 'cl', 'try', '-b', try_bot,
                           '--auth-refresh-token-json', self.auth_refresh_token_json])
             self.print_('## Waiting for Try Job Results')
             if self.has_failing_results():
                 self.write_test_expectations()
-            else:
-                self.print_('No Failures, committing patch.')
-            self.run(['git', 'cl', 'land', '-f', '--auth-refresh-token-json', self.auth_refresh_token_json])
+            self.run(['git', 'cl', 'set-commit', '--rietveld',
+                      '--auth-refresh-token-json', self.auth_refresh_token_json])
+            if self.has_failing_results():
+                self.print_('## CL has failing results when trying to land; aborting.')
+                self.run(['git', 'cl', 'set-close', '--auth-refresh-token-json', self.auth_refresh_token_json])
+                return 1

[qyearsley, 2016/08/16 22:35:59]

Note, this CL should make it so that after trying to commit, the script then
waits for all of the try jobs (in the CQ) to finish; if there are any failing
try jobs, then the main method should return 1 after closing the CL.

So, if there are any failing CQ try jobs then the overall script should have a
non-zero exit code, and I'm assuming that this should turn the step and the
build red.

I haven't tried this out yet though.

+            self.print_('## Auto-update complete.')
         return 0
 
     def parse_args(self, argv):
         parser = argparse.ArgumentParser()
         parser.description = __doc__
         parser.add_argument('-v', '--verbose', action='store_true',
                             help='log what we are doing')
         parser.add_argument('--allow-local-commits', action='store_true',
                             help='allow script to run even if we have local commits')
         parser.add_argument('--keep-w3c-repos-around', action='store_true',
@@ skipping 239 matching lines @@
             if dict_set['notification-email']:
                 directory_dict[dict_set['directory']] = dict_set['notification-email']
         return directory_dict
 
     def write_test_expectations(self):
         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])
         message = '\'Modifies TestExpectations and/or downloads new baselines for tests\''
         self.check_run(['git', 'commit', '-a', '-m', message])
-        self.check_run(['git', 'cl', 'upload', '-m', message,
+        self.check_run(['git', 'cl', 'upload', '-m', message, '--rietveld'
                         '--auth-refresh-token-json', self.auth_refresh_token_json])
 
     def has_failing_results(self):
         while True:
             time.sleep(POLL_DELAY_SECONDS)
             self.print_('Still waiting...')
             _, out = self.run(['git', 'cl', 'try-results'])
             results = self.parse_try_job_results(out)
             if results.get('Started') or results.get('Scheduled'):
                 continue
             if results.get('Failures'):
                 return True
             return False
 
     def generate_upload_command(self, email_list):
         message = """W3C auto test importer
 
 TBR=qyearsley@chromium.org"""
 
-        command = ['git', 'cl', 'upload', '-f', '-m', message]
+        command = ['git', 'cl', 'upload', '-f', '-m', message, '--rietveld']
         command += ['--cc=' + email for email in email_list]
         if self.auth_refresh_token_json:
             command += ['--auth-refresh-token-json', self.auth_refresh_token_json]
         return command