[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/test/monitor_try_job_pipeline_test.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 json
 import time
 
 from common import buildbucket_client
-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 waterfall.monitor_try_job_pipeline import MonitorTryJobPipeline
 from waterfall.test import wf_testcase
 from waterfall.try_job_type import TryJobType
 
 
 # A counter to enable different responses to requests in a loop.
 REQUEST_COUNTER = {
     '1': 0,
@@ skipping 174 matching lines @@
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
     try_job_data = WfTryJobData.Create(try_job_id)
     try_job_data.put()
     try_job.compile_results = [
         {
             'report': None,
             'url': 'url',
             'try_job_id': '1',
         }
     ]
-    try_job.status = wf_analysis_status.ANALYZING
+    try_job.status = analysis_status.RUNNING
     try_job.put()
     self._MockGetTryJobs(try_job_id)
 
     pipeline = MonitorTryJobPipeline()
     compile_result = pipeline.run(
         master_name, builder_name, build_number, TryJobType.COMPILE,
         try_job_id)
 
     expected_compile_result = {
         'report': {
             'result': {
                 'rev1': 'passed',
                 'rev2': 'failed'
             },
             'metadata': {
                 'regression_range_size': regression_range_size
             }
         },
         'url': 'url',
         'try_job_id': '1',
     }
 
     self.assertEqual(expected_compile_result, compile_result)
 
     try_job = WfTryJob.Get(master_name, builder_name, build_number)
     self.assertEqual(expected_compile_result, try_job.compile_results[-1])
-    self.assertEqual(wf_analysis_status.ANALYZING, try_job.status)
+    self.assertEqual(analysis_status.RUNNING, try_job.status)
 
     try_job_data = WfTryJobData.Get(try_job_id)
     self.assertEqual(try_job_data.regression_range_size, regression_range_size)
 
   def testGetTryJobsForTestSuccess(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
     try_job_id = '3'
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
     try_job.test_results = [
         {
             'report': None,
             'url': 'url',
             'try_job_id': '3',
         }
     ]
-    try_job.status = wf_analysis_status.ANALYZING
+    try_job.status = analysis_status.RUNNING
     try_job.put()
     self._MockGetTryJobs(try_job_id)
 
     pipeline = MonitorTryJobPipeline()
     test_result = pipeline.run(
         master_name, builder_name, build_number, TryJobType.TEST,
         try_job_id)
 
     expected_test_result = {
         'report': {
@@ skipping 13 matching lines @@
                 }
             }
         },
         'url': 'url',
         'try_job_id': '3',
     }
     self.assertEqual(expected_test_result, test_result)
 
     try_job = WfTryJob.Get(master_name, builder_name, build_number)
     self.assertEqual(expected_test_result, try_job.test_results[-1])
-    self.assertEqual(wf_analysis_status.ANALYZING, try_job.status)
+    self.assertEqual(analysis_status.RUNNING, try_job.status)
 
   def testUpdateTryJobResultAnalyzing(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
     try_job_id = '3'
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number).put()
 
     pipeline = MonitorTryJobPipeline()
     pipeline._UpdateTryJobResult(
         buildbucket_client.BuildbucketBuild.STARTED, master_name, builder_name,
         build_number, TryJobType.TEST, try_job_id, 'url')
     try_job = WfTryJob.Get(master_name, builder_name, build_number)
-    self.assertEqual(wf_analysis_status.ANALYZING, try_job.status)
+    self.assertEqual(analysis_status.RUNNING, try_job.status)