Refactoring scripts that wait for buildbot jobs to complete.

scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py

Index: scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py
diff --git a/scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py b/scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py
index 58e89a6662abfac0194e1582dd469def500bf1d5..f53390154ac0f43ff4ca46e3ef2c9db4924bc383 100644
--- a/scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py
+++ b/scripts/slave/recipe_modules/auto_bisect/perf_revision_state.py
@@ -141,17 +141,22 @@ class PerfRevisionState(revision_state.RevisionState):
       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."""