[chromedriver] Fix git migration issue and remove svn support from run_buildbot_steps.py

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 78 matching lines @@
   util.Unzip(zip_path, chrome_paths.GetBuildDir(['host_forwarder']))
 
 
 def _GetTestResultsLog(platform):
   """Gets the test results log for the given platform.
 
   Args:
     platform: The platform that the test results log is for.
 
   Returns:
-    A dictionary where the keys are SVN revisions and the values are booleans
+    A dictionary where the keys are commit positions and the values are booleans
     indicating whether the tests passed.
   """
   temp_log = tempfile.mkstemp()[1]
   log_name = TEST_LOG_FORMAT % platform
   result = slave_utils.GSUtilDownloadFile(
       '%s/%s' % (GS_CHROMEDRIVER_DATA_BUCKET, log_name), temp_log)
   if result:
     return {}
   with open(temp_log, 'rb') as log_file:
     json_dict = json.load(log_file)
   # Workaround for json encoding dictionary keys as strings.
   return dict([(int(v[0]), v[1]) for v in json_dict.items()])
 
 
 def _PutTestResultsLog(platform, test_results_log):
   """Pushes the given test results log to google storage."""
   temp_dir = util.MakeTempDir()
   log_name = TEST_LOG_FORMAT % platform
   log_path = os.path.join(temp_dir, log_name)
   with open(log_path, 'wb') as log_file:
     json.dump(test_results_log, log_file)
   if slave_utils.GSUtilCopyFile(log_path, GS_CHROMEDRIVER_DATA_BUCKET):
     raise Exception('Failed to upload test results log to google storage')
 
 
 def _UpdateTestResultsLog(platform, revision, passed):

[stgao, 2014/09/30 17:47:11]

|revision| -> |commit_position|?
Please update other occurrences too.

[samuong, 2014/09/30 18:07:07]

Done.

   """Updates the test results log for the given platform.
 
   Args:
     platform: The platform name.
-    revision: The SVN revision number.
+    revision: The commit position number.
     passed: Boolean indicating whether the tests passed at this revision.
   """
-  assert isinstance(revision, int), 'The revision must be an integer'
+
+  assert revision.isdigit(), 'The commit position must be a number'
+  revision = int(revision)
   log = _GetTestResultsLog(platform)
   if len(log) > 500:
     del log[min(log.keys())]
   assert revision not in log, 'Results already exist for revision %s' % revision
   log[revision] = bool(passed)
   _PutTestResultsLog(platform, log)
 
 
 def _GetVersion():
   """Get the current chromedriver version."""
@@ skipping 13 matching lines @@
     lines = f.readlines()
     chrome_min_version_line = [
         x for x in lines if 'kMinimumSupportedChromeVersion' in x]
   chrome_min_version = chrome_min_version_line[0].split('{')[1].split(',')[0]
   with open(os.path.join(chrome_paths.GetSrc(), 'chrome', 'VERSION'), 'r') as f:
     chrome_max_version = f.readlines()[0].split('=')[1].strip()
   return (chrome_min_version, chrome_max_version)
 
 
 def _RevisionState(test_results_log, revision):
-  """Check the state of tests at a given SVN revision.
+  """Check the state of tests at a given commit position.
 
   Considers tests as having passed at a revision if they passed at revisons both
   before and after.
 
   Args:
     test_results_log: A test results log dictionary from _GetTestResultsLog().
     revision: The revision to check at.
 
   Returns:
     'passed', 'failed', or 'unknown'
@@ skipping 218 matching lines @@
     util.PrintAndFlush('URL Error %s' % error.message)
     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)
-  util.PrintAndFlush('Failed to get svn revision number for %s' %
+  util.PrintAndFlush('Failed to get commit position number for %s' %
                      snapshot_hashcode)
   return None
 
 
 def _GetGitHashFromCommitPosition(commit_position):
   json_url = CR_REV_URL % commit_position
   try:
     response = urllib2.urlopen(json_url)
   except urllib2.HTTPError as error:
     util.PrintAndFlush('HTTP Error %d' % error.getcode())
     return None
   except urllib2.URLError as error:
     util.PrintAndFlush('URL Error %s' % error.message)
     return None
   data = json.loads(response.read())
   if 'git_sha' in data:
     return data['git_sha']
   util.PrintAndFlush('Failed to get git hash for %s' % commit_position)
   return None
 
 
 def _WaitForLatestSnapshot(revision):
   util.MarkBuildStepStart('wait_for_snapshot')
-  def _IsRevisionNumber(revision):
-    if isinstance(revision, int):
-      return True
-    else:
-      return revision.isdigit()
   while True:
     snapshot_revision = archive.GetLatestSnapshotVersion()

[stgao, 2014/09/30 17:47:11]

Is this one always the commit position now?
Last time I made the change, it was a git hash.

[samuong, 2014/09/30 18:07:07]

Looks like a commit position to me:

http://build.chromium.org/p/chromium.chromedriver/builders/Mac%2010.6/builds/...

-    if not _IsRevisionNumber(snapshot_revision):
-      snapshot_revision = _GetCommitPositionFromGitHash(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):
@@ skipping 25 matching lines @@
     os.environ['PATH'] += os.pathsep + os.pathsep.join(paths)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option(
       '', '--android-packages',
       help=('Comma separated list of application package names, '
             'if running tests on Android.'))
   parser.add_option(
-      '-r', '--revision', help='Chromium revision')
+      '-r', '--revision', help='Chromium git revision hash')
   parser.add_option(
       '', '--update-log', action='store_true',
       help='Update the test results log (only applicable to Android)')
   options, _ = parser.parse_args()
 
   bitness = '32'
   if util.IsLinux() and platform_module.architecture()[0] == '64bit':
     bitness = '64'
   platform = '%s%s' % (util.GetPlatformName(), bitness)
   if options.android_packages:
     platform = 'android'
 
   _CleanTmpDir()
 
   if not options.revision:
     commit_position = None
-  elif options.revision.isdigit():
-    commit_position = options.revision
   else:
     commit_position = _GetCommitPositionFromGitHash(options.revision)
 
   if platform == 'android':
     if not options.revision and options.update_log:
       parser.error('Must supply a --revision with --update-log')
     _DownloadPrebuilts()
   else:
     if not options.revision:
       parser.error('Must supply a --revision')
@@ skipping 28 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()