[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/test/process_swarming_task_result_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 datetime
 
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_swarming_task import WfSwarmingTask
 from waterfall import process_swarming_task_result_pipeline
 from waterfall import swarming_util
 from waterfall.process_swarming_task_result_pipeline import (
     ProcessSwarmingTaskResultPipeline)
 from waterfall.test import wf_testcase
 
 
 _ISOLATED_SERVER = 'https://isolateserver.appspot.com'
 _ISOLATED_STORAGE_URL = 'isolateserver.storage.googleapis.com'
@@ skipping 152 matching lines @@
         self.master_name, self.builder_name,
         self.build_number, self.step_name, task_id)
 
     self.assertEqual(self.step_name, step_name)
     self.assertEqual('abc_tests', task_info[0])
     self.assertEqual(_EXPECTED_CLASSIFIED_TESTS, task_info[1])
 
     task = WfSwarmingTask.Get(
         self.master_name, self.builder_name, self.build_number, self.step_name)
 
-    self.assertEqual(wf_analysis_status.ANALYZED, task.status)
+    self.assertEqual(analysis_status.COMPLETED, task.status)
     self.assertEqual(_EXPECTED_TESTS_STATUESE, task.tests_statuses)
     self.assertEqual(_EXPECTED_CLASSIFIED_TESTS, task.classified_tests)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 32, 6, 538220),
                      task.created_time)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 32, 9, 90550),
                      task.started_time)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 33, 9),
                      task.completed_time)
 
   def testProcessSwarmingTaskResultPipelineTaskNotRunning(self):
     task_id = 'task_id2'
 
     WfSwarmingTask.Create(
         self.master_name, self.builder_name,
         self.build_number, self.step_name).put()
 
     pipeline = ProcessSwarmingTaskResultPipeline()
     step_name, task_info = pipeline.run(
         self.master_name, self.builder_name,
         self.build_number, self.step_name, task_id)
 
     self.assertEqual(self.step_name, step_name)
     self.assertIsNone(task_info[0])
     self.assertEqual({}, task_info[1])
 
     task = WfSwarmingTask.Get(
         self.master_name, self.builder_name, self.build_number, self.step_name)
 
-    self.assertEqual(wf_analysis_status.ERROR, task.status)
+    self.assertEqual(analysis_status.ERROR, task.status)
     self.assertEqual({}, task.tests_statuses)
     self.assertEqual({}, task.classified_tests)
 
   def testProcessSwarmingTaskResultPipelineTaskTimeOut(self):
     task_id = 'task_id1'
 
     # Override swarming config settings to force a timeout.
     override_swarming_settings = {
         'task_timeout_hours': -1
     }
     self.UpdateUnitTestConfigSettings(
         'swarming_settings', override_swarming_settings)
 
     WfSwarmingTask.Create(
         self.master_name, self.builder_name,
         self.build_number, self.step_name).put()
 
     pipeline = ProcessSwarmingTaskResultPipeline()
     step_name, task_info = pipeline.run(
         self.master_name, self.builder_name,
         self.build_number, self.step_name, task_id)
 
     self.assertEqual(self.step_name, step_name)
     self.assertEqual('abc_tests', task_info[0])
     self.assertEqual({}, task_info[1])
 
     task = WfSwarmingTask.Get(
         self.master_name, self.builder_name, self.build_number, self.step_name)
 
-    self.assertEqual(wf_analysis_status.ERROR, task.status)
+    self.assertEqual(analysis_status.ERROR, task.status)
     self.assertEqual({}, task.tests_statuses)
     self.assertEqual({}, task.classified_tests)