Add --auto-update flag which uploads committed CL and initiates the CQ

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 time
 
 from webkitpy.common.webkit_finder import WebKitFinder
 
 # Import destination directories (under LayoutTests/imported/).
 WPT_DEST_NAME = 'wpt'
 CSS_DEST_NAME = 'csswg-test'
 
+# Used for time.sleep().
+FIVE_MINUTES = 300

[qyearsley, 2016/07/06 22:13:29]

FIVE_MINUTES is a bad name because if you ever change the value, you have to
change the name too.

For example, imagine we later want to change it to 600 seconds but forget to
change the name; then, further down in the code we'd have sleep(FIVE_MINUTES)
but it would actually be sleeping for 10 minutes.

Ideally we should use names that explain the purpose and don't have to be
changed, and don't require a comment to explain them. What about
POLL_DELAY_SECONDS or something similar?

+
 
 class DepsUpdater(object):
 
     def __init__(self, host):
         self.host = host
         self.executive = host.executive
         self.fs = host.filesystem
         self.finder = WebKitFinder(self.fs)
         self.verbose = False
         self.allow_local_commits = False
         self.keep_w3c_repos_around = False
         self.target = None
+        self.auto_update = False
 
     def main(self, argv=None):
         self.parse_args(argv)
 
         if not self.checkout_is_okay():
             return 1
 
         self.print_('## Noting the current Chromium commit.')
         _, show_ref_output = self.run(['git', 'show-ref', 'HEAD'])
         chromium_commitish = show_ref_output.split()[0]
@@ skipping 16 matching lines @@
 
         elif self.target == 'css':
             import_commitish = self.update(
                 CSS_DEST_NAME,
                 'https://chromium.googlesource.com/external/w3c/csswg-test.git')
         else:
             raise AssertionError("Unsupported target %s" % self.target)
 
         self.commit_changes_if_needed(chromium_commitish, import_commitish)
 
+        if self.auto_update:
+            self.run(['git', 'cl', 'upload', '-f'])
+            self.run(['git', 'cl', 'set-commit', '-d'])

[qyearsley, 2016/07/06 22:13:29]

If you change '-d' to '--dry-run', then it may be clearer what it's doing.

+            while True:
+                time.sleep(FIVE_MINUTES)
+                _, out = self.run(['git', 'cl', 'try-results'])
+                results = self.parse_try_job_results(out)
+                if results['Started'] != set([]) or results['Scheduled'] != set([]):
+                    continue
+                if results['Failures'] != set([]):
+                    return 1
+                break
         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',
                             help='leave the w3c repos around that were imported previously.')
         parser.add_argument('target', choices=['css', 'wpt'],
                             help='Target repository.  "css" for csswg-test, "wpt" for web-platform-tests.')
+        parser.add_argument('--auto-update', action='store_true',
+                            help='uploads CL and initiates commit queue.')
 
         args = parser.parse_args(argv)
         self.allow_local_commits = args.allow_local_commits
         self.keep_w3c_repos_around = args.keep_w3c_repos_around
         self.verbose = args.verbose
         self.target = args.target
+        self.auto_update = args.auto_update
 
     def checkout_is_okay(self):
         git_diff_retcode, _ = self.run(['git', 'diff', '--quiet', 'HEAD'], exit_on_failure=False)
         if git_diff_retcode:
             self.print_('## Checkout is dirty; aborting.')
             return False
 
         local_commits = self.run(['git', 'log', '--oneline', 'origin/master..HEAD'])[1]
         if local_commits and not self.allow_local_commits:
             self.print_('## Checkout has local commits; aborting. Use --allow-local-commits to allow this.')
@@ skipping 123 matching lines @@
         dest = self.path_from_webkit_base(*comps)
         if self.verbose:
             self.print_('rm -fr %s' % dest)
         self.fs.rmtree(dest)
 
     def path_from_webkit_base(self, *comps):
         return self.finder.path_from_webkit_base(*comps)
 
     def print_(self, msg):
         self.host.print_(msg)
+
+    def parse_try_job_results(self, results):
+        """Parses try job results from Rietveld.
+
+        Turns the output from git cl try-results into a usable format.
+
+        Args:
+            results: The stdout obtained by running git cl try-results
+
+        Returns:
+            A dict mapping a specified set of results to the builders that
+            obtained those results. The list is builders is represented as
+            a set and any bots in bot failures and successes set are removed
+            from failures
+
+        Raises:
+            AttributeError: An unexpected result was found
+        """
+        sets = {}
+        for line in results.splitlines():
+            line.strip()
+            print line
+            if line[len(line) - 1] == ':':
+                result_type = line[:len(line) - 1]
+                sets[result_type] = set()
+            elif line.split()[0] == 'Total:':
+                break
+            else:
+                sets[result_type].add(line.split()[0])
+            print sets
+        sets['Failures'] -= sets['Successes']
+        sets['Started'] -= sets['Successes']
+        sets['Started'] -= sets['Failures']
+        return sets