[Chromedriver] Convert Git hash to svn revision if required.

chrome/test/chromedriver/run_buildbot_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Runs all the buildbot steps for ChromeDriver except for update/compile."""
 
 import bisect
 import csv
 import datetime
@@ skipping 13 matching lines @@
 _THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 GS_CHROMEDRIVER_BUCKET = 'gs://chromedriver'
 GS_CHROMEDRIVER_DATA_BUCKET = 'gs://chromedriver-data'
 GS_CHROMEDRIVER_RELEASE_URL = 'http://chromedriver.storage.googleapis.com'
 GS_CONTINUOUS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/continuous'
 GS_PREBUILTS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/prebuilts'
 GS_SERVER_LOGS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/server_logs'
 SERVER_LOGS_LINK = (
     'http://chromedriver-data.storage.googleapis.com/server_logs')
 TEST_LOG_FORMAT = '%s_log.json'
+GS_GITHASH_TO_SVN_URL =\
+    'https://chromium.googlesource.com/chromium/src/+/%s?format=json'
+GS_SEARCH_PATTERN =\
+    r'.*git-svn-id: svn://svn.chromium.org/chrome/trunk/src@(\d+) '
 
 SCRIPT_DIR = os.path.join(_THIS_DIR, os.pardir, os.pardir, os.pardir, os.pardir,
                           os.pardir, os.pardir, os.pardir, 'scripts')
 SITE_CONFIG_DIR = os.path.join(_THIS_DIR, os.pardir, os.pardir, os.pardir,
                                os.pardir, os.pardir, os.pardir, os.pardir,
                                'site_config')
 sys.path.append(SCRIPT_DIR)
 sys.path.append(SITE_CONFIG_DIR)
 
 import archive
@@ skipping 328 matching lines @@
   print 'cleaning temp directory:', tmp_dir
   for file_name in os.listdir(tmp_dir):
     file_path = os.path.join(tmp_dir, file_name)
     if os.path.isdir(file_path):
       print 'deleting sub-directory', file_path
       shutil.rmtree(file_path, True)
     if file_name.startswith('chromedriver_'):
       print 'deleting file', file_path
       os.remove(file_path)
 
+def _GetSVNRevisionFromGitHash(snapshot_revision):
+  json_url = GS_GITHASH_TO_SVN_URL % snapshot_revision
+  try:
+    response = urllib2.urlopen(json_url)
+  except urllib2.HTTPError, error:
+    print 'HTTP Error %d' % error.getcode()

[stgao, 2014/06/20 22:58:17]

Please use util.PrintAndFlush instead of print.

[pshenoy, 2014/06/20 23:04:08]

Done.

+    return None
+  data = json.loads(response.read()[4:])
+  if 'message' in data:
+    message = data['message'].split('\n')
+    message = [line for line in message if line.strip()]
+    search_pattern = re.compile(GS_SEARCH_PATTERN)
+    result = search_pattern.search(message[len(message)-1])
+    if result:
+      return result.group(1)
+  return None
 
 def _WaitForLatestSnapshot(revision):
   util.MarkBuildStepStart('wait_for_snapshot')
   while True:
     snapshot_revision = archive.GetLatestSnapshotVersion()
-    if int(snapshot_revision) >= int(revision):
-      break
-    util.PrintAndFlush('Waiting for snapshot >= %s, found %s' %
-                       (revision, snapshot_revision))
+    if not revision.isdigit():
+      revision = _GetSVNRevisionFromGitHash(revision)
+    if not snapshot_revision.isdigit():
+      snapshot_revision = _GetSVNRevisionFromGitHash(snapshot_revision)
+    if revision is not None and snapshot_revision is not None:
+      if int(snapshot_revision) >= int(revision):
+        break
+      util.PrintAndFlush('Waiting for snapshot >= %s, found %s' %
+                         (revision, snapshot_revision))
     time.sleep(60)
   util.PrintAndFlush('Got snapshot revision %s' % snapshot_revision)
 
 
 def _AddToolsToPath(platform_name):
   """Add some tools like Ant and Java to PATH for testing steps to use."""
   paths = []
   error_message = ''
   if platform_name == 'win32':
     paths = [
@@ skipping 80 matching lines @@
     util.MarkBuildStepStart('run_all_tests.py')
     util.MarkBuildStepError()
 
   # Add a "cleanup" step so that errors from runtest.py or bb_device_steps.py
   # (which invoke this script) are kept in thier own build step.
   util.MarkBuildStepStart('cleanup')
 
 
 if __name__ == '__main__':
   main()