Rename and refactor PostBuildRequestAndWait.

tools/auto_bisect/bisect_perf_regression.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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 1304 matching lines @@
     fetch_build_func = lambda: self.GetBuildArchiveForRevision(
       revision, self.opts.gs_bucket, self.opts.target_arch,
       patch_sha, abs_build_dir)
 
     # Downloaded archive file path, downloads build archive for given revision.
     downloaded_file = fetch_build_func()
 
     # When build archive doesn't exists, post a build request to tryserver
     # and wait for the build to be produced.
     if not downloaded_file:
-      downloaded_file = self.PostBuildRequestAndWait(
+      downloaded_file = self._RequestBuildAndWait(
           revision, fetch_build=fetch_build_func, patch=patch)
       if not downloaded_file:
         return False
 
     # Generic name for the archive, created when archive file is extracted.
     output_dir = os.path.join(
         abs_build_dir, GetZipFileName(target_arch=self.opts.target_arch))
 
     # Unzip build archive directory.
     try:
@@ skipping 19 matching lines @@
       self.BackupOrRestoreOutputDirectory(restore=True)
       # Cleanup any leftovers from unzipping.
       if os.path.exists(output_dir):
         RemoveDirectoryTree(output_dir)
     finally:
       # Delete downloaded archive
       if os.path.exists(downloaded_file):
         os.remove(downloaded_file)
     return False
 
-  def PostBuildRequestAndWait(self, git_revision, fetch_build, patch=None):
-    """POSTs the build request job to the try server instance.
+  def _RequestBuildAndWait(self, git_revision, fetch_build, patch=None):
+    """Triggers a try job for a build job.
 
-    A try job build request is posted to tryserver.chromium.perf master,
-    and waits for the binaries to be produced and archived on cloud storage.
-    Once the build is ready and stored onto cloud, build archive is downloaded
-    into the output folder.
+    This function prepares and starts a try job on the tryserver.chromium.perf
+    master, and waits for the binaries to be produced and archived in cloud
+    storage. Once the build is ready it's downloaded.
 
     Args:
       git_revision: A Git hash revision.
       fetch_build: Function to check and download build from cloud storage.
       patch: A DEPS patch (used while bisecting 3rd party repositories).
 
     Returns:
       Downloaded archive file path when requested build exists and download is
       successful, otherwise None.
     """
-    def GetBuilderNameAndBuildTime(target_platform, target_arch='ia32'):
-      """Gets builder bot name and build time in seconds based on platform."""
-      # Bot names should match the one listed in tryserver.chromium's
-      # master.cfg which produces builds for bisect.
-      if bisect_utils.IsWindowsHost():
-        if bisect_utils.Is64BitWindows() and target_arch == 'x64':
-          return ('win_perf_bisect_builder', MAX_WIN_BUILD_TIME)
-        return ('win_perf_bisect_builder', MAX_WIN_BUILD_TIME)
-      if bisect_utils.IsLinuxHost():
-        if target_platform == 'android':
-          return ('android_perf_bisect_builder', MAX_LINUX_BUILD_TIME)
-        return ('linux_perf_bisect_builder', MAX_LINUX_BUILD_TIME)
-      if bisect_utils.IsMacHost():
-        return ('mac_perf_bisect_builder', MAX_MAC_BUILD_TIME)
-      raise NotImplementedError('Unsupported Platform "%s".' % sys.platform)
     if not fetch_build:
       return False
 
     # Create a unique ID for each build request posted to try server builders.
     # This ID is added to "Reason" property of the build.
     build_request_id = GetSHA1HexDigest(
         '%s-%s-%s' % (git_revision, patch, time.time()))
 
     # Reverts any changes to DEPS file.
     source_control.CheckoutFileAtRevision(
       bisect_utils.FILE_DEPS, git_revision, cwd=self.src_cwd)
 
-    bot_name, build_timeout = GetBuilderNameAndBuildTime(
-       self.opts.target_platform, self.opts.target_arch)
+    bot_name = self._GetBuilderName(self.opts.target_platform)
+    build_timeout = self._GetBuilderBuildTime()
     target_file = None
     try:
       # Execute try job request to build revision with patch.
       _BuilderTryjob(git_revision, bot_name, build_request_id, patch)
       target_file, error_msg = _WaitUntilBuildIsReady(
           fetch_build, bot_name, self.opts.builder_host,
           self.opts.builder_port, build_request_id, build_timeout)
       if not target_file:
         print '%s [revision: %s]' % (error_msg, git_revision)
     except RunGitError as e:
       print ('Failed to post builder try job for revision: [%s].\n'
              'Error: %s' % (git_revision, e))
 
     return target_file
 
+  @staticmethod
+  def _GetBuilderName(target_platform):
+    """Gets builder bot name and build time in seconds based on platform."""
+    if bisect_utils.IsWindowsHost():
+      return 'win_perf_bisect_builder'
+    if bisect_utils.IsLinuxHost():
+      if target_platform == 'android':
+        return 'android_perf_bisect_builder'
+      return 'linux_perf_bisect_builder'
+    if bisect_utils.IsMacHost():
+      return 'mac_perf_bisect_builder'
+    raise NotImplementedError('Unsupported Platform "%s".' % sys.platform)
+
+  @staticmethod
+  def _GetBuilderBuildTime():
+    """Returns the time to wait for a build after requesting one."""
+    if bisect_utils.IsWindowsHost():
+      return MAX_WIN_BUILD_TIME
+    if bisect_utils.IsLinuxHost():
+      return MAX_LINUX_BUILD_TIME
+    if bisect_utils.IsMacHost():
+      return MAX_MAC_BUILD_TIME
+    raise NotImplementedError('Unsupported Platform "%s".' % sys.platform)
+
   def IsDownloadable(self, depot):
     """Checks if build can be downloaded based on target platform and depot."""
     if (self.opts.target_platform in ['chromium', 'android'] and
         self.opts.gs_bucket):
       return (depot == 'chromium' or
               'chromium' in DEPOT_DEPS_NAME[depot]['from'] or
               'v8' in DEPOT_DEPS_NAME[depot]['from'])
     return False
 
   def UpdateDepsContents(self, deps_contents, depot, git_revision, deps_key):
@@ skipping 1853 matching lines @@
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())