[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/process_swarming_task_result_pipeline.py

 # Copyright 2016 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 collections import defaultdict
 import datetime
 import logging
 import time
 
 from common.http_client_appengine import HttpClientAppengine as HttpClient
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_swarming_task import WfSwarmingTask
 from pipeline_wrapper import BasePipeline
 from waterfall import swarming_util
 from waterfall import waterfall_config
 
 
 def _CheckTestsRunStatuses(output_json):
   """Checks result status for each test run and saves the numbers accordingly.
 
   Args:
@@ skipping 75 matching lines @@
       if task_state not in swarming_util.STATES_RUNNING:
         task_completed = True
         task = WfSwarmingTask.Get(
             master_name, builder_name, build_number, step_name)
         if task_state == swarming_util.STATE_COMPLETED:
           outputs_ref = data.get('outputs_ref')
           output_json = swarming_util.GetSwarmingTaskFailureLog(
               outputs_ref, self.HTTP_CLIENT)
           tests_statuses = _CheckTestsRunStatuses(output_json)
 
-          task.status = wf_analysis_status.ANALYZED
+          task.status = analysis_status.COMPLETED
           task.tests_statuses = tests_statuses
         else:
-          task.status = wf_analysis_status.ERROR
+          task.status = analysis_status.ERROR
           logging.error('Swarming task stopped with status: %s' % (
               task_state))
         priority_str = swarming_util.GetTagValue(
             data.get('tags', {}), 'priority')
         if priority_str:
           task.parameters['priority'] = int(priority_str)
         task.put()
       else:  # pragma: no cover
         if task_state == 'RUNNING' and not task_started:
           # swarming task just starts, update status.
           task_started = True
           task = WfSwarmingTask.Get(
               master_name, builder_name, build_number, step_name)
-          task.status = wf_analysis_status.ANALYZING
+          task.status = analysis_status.RUNNING
           task.put()
 
         time.sleep(server_query_interval_seconds)
 
       if time.time() > deadline:
         # Updates status as ERROR.
         task = WfSwarmingTask.Get(
             master_name, builder_name, build_number, step_name)
-        task.status = wf_analysis_status.ERROR
+        task.status = analysis_status.ERROR
         task.put()
         logging.error('Swarming task timed out after %d hours.' % timeout_hours)
         break  # Stops the loop and return.
 
     # Update swarming task metadate.
     task = WfSwarmingTask.Get(
         master_name, builder_name, build_number, step_name)
     task.created_time = _ConvertDateTime(data.get('created_ts'))
     task.started_time = _ConvertDateTime(data.get('started_ts'))
     task.completed_time = _ConvertDateTime(data.get('completed_ts'))
     task.put()
 
     return step_name, (step_name_no_platform, task.classified_tests)