[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/monitor_try_job_pipeline.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.
 
 from datetime import datetime
 import time
 
 from common import buildbucket_client
 from common.buildbucket_client import BuildbucketBuild
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_try_job import WfTryJob
 from model.wf_try_job_data import WfTryJobData
 from pipeline_wrapper import BasePipeline
 from pipeline_wrapper import pipeline
 from waterfall import waterfall_config
 from waterfall.try_job_type import TryJobType
 
 
 class MonitorTryJobPipeline(BasePipeline):
   """A pipeline for monitoring a try job and recording results when it's done.
@@ skipping 57 matching lines @@
       result_to_update = try_job_result.test_results
     if (result_to_update and
         result_to_update[-1]['try_job_id'] == try_job_id):
       result_to_update[-1].update(result)
     else:  # pragma: no cover
       # Normally result for current try job should've been saved in
       # schedule_try_job_pipeline, so this branch shouldn't be reached.
       result_to_update.append(result)
 
     if status == BuildbucketBuild.STARTED:
-      try_job_result.status = wf_analysis_status.ANALYZING
+      try_job_result.status = analysis_status.RUNNING
     try_job_result.put()
     return result_to_update
 
   # Arguments number differs from overridden method - pylint: disable=W0221
   # TODO(chanli): Handle try job for test failures later.
   def run(
       self, master_name, builder_name, build_number, try_job_type, try_job_id):
     assert try_job_id
 
     timeout_hours = waterfall_config.GetTryJobSettings().get(
@@ skipping 52 matching lines @@
 
       if time.time() > deadline:  # pragma: no cover
         self._UpdateTryJobMetadataForCompletedBuild(
             try_job_data, build, start_time, timed_out=True)
         # Explicitly abort the whole pipeline.
         raise pipeline.Abort(
             'Try job %s timed out after %d hours.' % (
                 try_job_id, timeout_hours))
 
       time.sleep(pipeline_wait_seconds)  # pragma: no cover