[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.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.
 
 import time
 
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_swarming_task import WfSwarmingTask
 from waterfall import swarming_util
 from waterfall import trigger_swarming_task_pipeline
 from waterfall import waterfall_config
 from waterfall.swarming_task_request import SwarmingTaskRequest
 from waterfall.test import wf_testcase
 from waterfall.trigger_swarming_task_pipeline import TriggerSwarmingTaskPipeline
 
 
 class TriggerSwarmingTaskPipelineTest(wf_testcase.WaterfallTestCase):
 
   def testNoNewSwarmingTaskIsNeeded(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
     step_name = 's'
     tests = ['a.b']
 
     def MockedListSwarmingTasksDataByTags(*_):
       raise Exception('Fail.')  # pragma: no cover. Should never be reached.
     self.mock(swarming_util, 'ListSwarmingTasksDataByTags',
               MockedListSwarmingTasksDataByTags)
     swarming_task = WfSwarmingTask.Create(
         master_name, builder_name, build_number, step_name)
-    swarming_task.status = wf_analysis_status.ANALYZING
+    swarming_task.status = analysis_status.RUNNING
     swarming_task.task_id = 'task_id'
     swarming_task.put()
 
     pipeline = TriggerSwarmingTaskPipeline()
     task_id = pipeline.run(
         master_name, builder_name, build_number, step_name, tests)
     self.assertEqual('task_id', task_id)
 
   def testWaitingForTheTaskId(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
     step_name = 's'
     tests = ['a.b']
 
     swarming_task = WfSwarmingTask.Create(
         master_name, builder_name, build_number, step_name)
-    swarming_task.status = wf_analysis_status.PENDING
+    swarming_task.status = analysis_status.PENDING
     swarming_task.put()
 
     def MockedSleep(*_):
       swarming_task = WfSwarmingTask.Get(
           master_name, builder_name, build_number, step_name)
-      self.assertEqual(wf_analysis_status.PENDING, swarming_task.status)
-      swarming_task.status = wf_analysis_status.ANALYZING
+      self.assertEqual(analysis_status.PENDING, swarming_task.status)
+      swarming_task.status = analysis_status.RUNNING
       swarming_task.task_id = 'task_id'
       swarming_task.put()
     self.mock(time, 'sleep', MockedSleep)
 
     pipeline = TriggerSwarmingTaskPipeline()
     task_id = pipeline.run(
         master_name, builder_name, build_number, step_name, tests)
     self.assertEqual('task_id', task_id)
 
   def testTriggerANewSwarmingTask(self):
@@ skipping 84 matching lines @@
     self.assertEqual(expected_new_request_json, new_request_json)
 
     swarming_task = WfSwarmingTask.Get(
         master_name, builder_name, build_number, step_name)
     self.assertIsNotNone(swarming_task)
     self.assertEqual('new_task_id', swarming_task.task_id)
     self.assertEqual(tests, swarming_task.parameters['tests'])
     self.assertEqual(
         waterfall_config.GetSwarmingSettings()['iterations_to_rerun'],
         swarming_task.parameters['iterations_to_rerun'])