[Findit] Refactoring monitor swarming task pipelines

appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py

Index: appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
diff --git a/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py b/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
index 3026c133da81221e2cd0f5a437ea159a40ddb53e..e06e6f167c2ea318b9200a90cf2609c18823d4ff 100644
--- a/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
+++ b/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
@@ -6,7 +6,6 @@ import datetime
 
 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)
@@ -83,7 +82,9 @@ _SAMPLE_FAILURE_LOG = {
         }
     ]
 }
-_EXPECTED_TESTS_STATUESE = {
+
+
+_EXPECTED_TESTS_STATUS = {
     'TestSuite1.test1': {
         'total_run': 2,
         'SUCCESS': 2
@@ -98,6 +99,8 @@ _EXPECTED_TESTS_STATUESE = {
         'FAILURE': 6
     }
 }
+
+
 _EXPECTED_CLASSIFIED_TESTS = {
     'flaky_tests': ['TestSuite1.test2', 'TestSuite1.test1'],
     'reliable_tests': ['TestSuite1.test3']
@@ -144,20 +147,20 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
 
   def testCheckTestsRunStatusesNoOutPutJson(self):
     tests_statuses = (
-        process_swarming_task_result_pipeline._CheckTestsRunStatuses(None))
+        ProcessSwarmingTaskResultPipeline()._CheckTestsRunStatuses(None))
     self.assertEqual({}, tests_statuses)
 
   def testCheckTestsRunStatuses(self):
     tests_statuses = (
-        process_swarming_task_result_pipeline._CheckTestsRunStatuses(
+        ProcessSwarmingTaskResultPipeline()._CheckTestsRunStatuses(
             _SAMPLE_FAILURE_LOG))
-    self.assertEqual(_EXPECTED_TESTS_STATUESE, tests_statuses)
+    self.assertEqual(_EXPECTED_TESTS_STATUS, tests_statuses)
 
   def _MockedGetSwarmingTaskFailureLog(self, *_):
     return _SAMPLE_FAILURE_LOG
 
   def testProcessSwarmingTaskResultPipeline(self):
-
+    # End to end test.
     self.mock(swarming_util, 'GetSwarmingTaskFailureLog',
               self._MockedGetSwarmingTaskFailureLog)
 
@@ -180,7 +183,7 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
         self.master_name, self.builder_name, self.build_number, self.step_name)
 
     self.assertEqual(analysis_status.COMPLETED, task.status)
-    self.assertEqual(_EXPECTED_TESTS_STATUESE, task.tests_statuses)
+    self.assertEqual(_EXPECTED_TESTS_STATUS, 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)
@@ -188,58 +191,3 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
                      task.started_time)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 33, 9),
                      task.completed_time)
-
-  def testProcessSwarmingTaskResultPipelineTaskNotRunning(self):
-
-    task = WfSwarmingTask.Create(
-        self.master_name, self.builder_name,
-        self.build_number, self.step_name)
-    task.task_id = 'task_id2'
-    task.put()
-
-    pipeline = ProcessSwarmingTaskResultPipeline()
-    step_name, task_info = pipeline.run(
-        self.master_name, self.builder_name,
-        self.build_number, self.step_name)
-
-    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(analysis_status.ERROR, task.status)
-    self.assertEqual({}, task.tests_statuses)
-    self.assertEqual({}, task.classified_tests)
-
-  def testProcessSwarmingTaskResultPipelineTaskTimeOut(self):
-
-    # Override swarming config settings to force a timeout.
-    override_swarming_settings = {
-        'task_timeout_hours': -1
-    }
-    self.UpdateUnitTestConfigSettings(
-        'swarming_settings', override_swarming_settings)
-
-    task = WfSwarmingTask.Create(
-        self.master_name, self.builder_name,
-        self.build_number, self.step_name)
-    task.task_id = 'task_id1'
-    task.put()
-
-    pipeline = ProcessSwarmingTaskResultPipeline()
-    step_name, task_info = pipeline.run(
-        self.master_name, self.builder_name,
-        self.build_number, self.step_name)
-
-    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(analysis_status.ERROR, task.status)
-    self.assertEqual({}, task.tests_statuses)
-    self.assertEqual({}, task.classified_tests)