Refactoring scripts that wait for buildbot jobs to complete.

scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py

 # Copyright 2015 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.
 
 import json
 import tempfile
 import os
 import uuid
 
 from . import revision_state
@@ skipping 123 matching lines @@
                              self.test_job_name + '.results')
     api.m.trigger(perf_test_properties, name=step_name)
 
   def get_next_url(self):
     if self.status == PerfRevisionState.BUILDING:
       return self.build_url
     if self.status == PerfRevisionState.TESTING:
       return self.test_results_url
 
   def get_buildbot_locator(self):
+    if self.status not in (PerfRevisionState.BUILDING,
+                           PerfRevisionState.TESTING):  # pragma: no cover
+      return None
+    # TODO(robertocn): Remove hardcoded master.
+    master = 'tryserver.chromium.perf'
     if self.status == PerfRevisionState.BUILDING:
-      # TODO(robertocn): Remove hardcoded master.
-      master = 'tryserver.chromium.perf'
-      bot_name = self.bisector.get_builder_bot_for_this_platform()
+      builder = self.bisector.get_builder_bot_for_this_platform()
       job_name = self.build_job_name

[prasadv, 2015/09/17 22:33:34]

I think at any given point a revision can either be building or testing, not
both at same time. right?
Then in that case why do want to have different job_names
variables(build_job_name and test_job_name)?

[RobertoCN, 2015/09/19 00:32:54]

There's no need to have them separate anymore. I just merged them.

Done.

-      return 'bb:%s:%s:%s' % (master, bot_name, job_name)
     if self.status == PerfRevisionState.TESTING:
-      master = 'tryserver.chromium.perf'
-      bot_name = self.bisector.get_perf_tester_name()
+      builder = self.bisector.get_perf_tester_name()
       job_name = self.test_job_name
-      return 'bb:%s:%s:%s' % (master, bot_name, job_name)
+    return {
+        'master': master,
+        'builder': builder,
+        'job_name': job_name,
+    }
 
   def _get_test_results(self):
     """Tries to get the results of a test job from cloud storage."""
     api = self.bisector.api
     try:
       stdout = api.m.raw_io.output()
       name = 'Get test results for build ' + self.commit_hash
       step_result = api.m.gsutil.cat(self.test_results_url, stdout=stdout,
                                      name=name)
     except api.m.step.StepFailure:  # pragma: no cover
@@ skipping 11 matching lines @@
       True if this revision is closer to the initial good revision's value than
       to the initial bad revision's value. False otherwise.
     """
     # TODO: Reevaluate this approach
     bisector = self.bisector
     distance_to_good = abs(self.mean_value - bisector.good_rev.mean_value)
     distance_to_bad = abs(self.mean_value - bisector.bad_rev.mean_value)
     if distance_to_good < distance_to_bad:
       return True
     return False