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.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also attempt to
 upload a CL, triggery try jobs, and make any changes that are required for
 new failing tests before committing.
 """
@@ skipping 55 matching lines @@
                 self.run(['git', 'add', destination])
 
         elif self.target == 'css':
             import_commitish = self.update(CSS_DEST_NAME, WPT_REPO_URL)
         else:
             raise AssertionError("Unsupported target %s" % self.target)
 
         has_changes = self.commit_changes_if_needed(chromium_commitish, import_commitish)
 
         if self.auto_update and has_changes:
-            self.do_auto_update()
+            commit_successful = self.do_auto_update()
+            if not commit_successful:
+                return 1
         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 175 matching lines @@
     def print_(self, msg):
         self.host.print_(msg)
 
     def do_auto_update(self):
         """Attempts to upload a CL, make any required adjustments, and commit.
 
         This function assumes that the imported repo has already been updated,
         and that change has been committed. There may be newly-failing tests,
         so before being able to commit these new changes, we may need to update
         TestExpectations or download new baselines.
+
+        Returns:
+            True if successfully committed, False otherwise.
         """
         email_list = self.get_directory_owners_to_cc()
         self.print_('## Uploading change list.')
         self.check_run(self.generate_upload_command(email_list))
         self.trigger_try_jobs()
         if self.has_failing_results():
             self.write_test_expectations()
-            # TODO(qyearsley): After writing test expectations, the CL needs
-            # to be tried again on the try bots, and closed if it fails.
-        else:
-            self.print_('No Failures, committing patch.')
-        self.run(['git', 'cl', 'land', '-f', '--auth-refresh-token-json', self.auth_refresh_token_json])
-        # TODO(qyearsley): Attempting to land should trigger the CQ -- if
-        # the CQ fails, we should abort and close the CL.
+        command = ['git', 'cl', 'set-commit', '--rietveld']
+        if self.auth_refresh_token_json:
+            command += ['--auth-refresh-token-json', self.auth_refresh_token_json]
+        self.run(command)
+        if self.has_failing_results():
+            self.print_('## CL has failing results when trying to land; aborting.')
+            command = ['git', 'cl', 'set-close']
+            if self.auth_refresh_token_json:
+                command += ['--auth-refresh-token-json', self.auth_refresh_token_json]
+            self.run(command)
+            return False
+        return True
+
 
     def get_directory_owners_to_cc(self):
         """Returns a list of email addresses to CC for the current import."""
         self.print_('## Gathering directory owners emails to CC.')
         directory_owners_file_path = self.finder.path_from_webkit_base(
             'Tools', 'Scripts', 'webkitpy', 'w3c', 'directory_owners.json')
         with open(directory_owners_file_path) as data_file:
             directory_to_owner = self.parse_directory_owners(json.load(data_file))
         out = self.check_run(['git', 'diff', 'master', '--name-only'])
         changed_files = out.splitlines()
@@ skipping 22 matching lines @@
         email_addresses = set()
         for file_path in changed_files:
             test_path = self.finder.layout_test_name(file_path)
             test_dir = self.fs.dirname(test_path)
             if test_dir in directory_to_owner:
                 email_addresses.add(directory_to_owner[test_dir])
         return sorted(email_addresses)
 
     def generate_upload_command(self, email_list):
         message = 'W3C auto test importer\n\nTBR=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
 
     def trigger_try_jobs(self):
         """Triggers try jobs on all Blink layout test try bots."""
         self.print_('## Triggering try jobs.')
         for try_bot in self.host.builders.all_try_builder_names():
             self.run(['git', 'cl', 'try', '-b', try_bot,
@@ skipping 39 matching lines @@
             else:
                 sets[result_type].add(line.split()[0])
         return sets
 
     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])