[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/test/try_job_util_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 model import wf_analysis_status
+from model import analysis_status
 from model.wf_try_job import WfTryJob
 from waterfall import try_job_util
 from waterfall.test import wf_testcase
 from waterfall.try_job_type import TryJobType
 
 
 class _MockRootPipeline(object):
   STARTED = False
 
   def __init__(self, *_):
@@ skipping 121 matching lines @@
     failed_steps = {
         'compile': {
             'current_failure': 223,
             'first_failure': 223,
             'last_pass': 220
         }
     }
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
     try_job.compile_results = [['rev', 'failed']]
-    try_job.status = wf_analysis_status.ANALYZED
+    try_job.status = analysis_status.COMPLETED
     try_job.put()
 
     failure_result_map = {}
     need_try_job, last_pass, try_job_type, targeted_tests = (
         try_job_util._NeedANewTryJob(master_name, builder_name, build_number,
                                      failed_steps, failure_result_map))
 
     expected_failure_result_map = {
         'compile': 'm/b/223'
     }
@@ skipping 10 matching lines @@
     build_number = 223
     failed_steps = {
         'compile': {
             'current_failure': 223,
             'first_failure': 223,
             'last_pass': 220
         }
     }
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
-    try_job.status = wf_analysis_status.ERROR
+    try_job.status = analysis_status.ERROR
     try_job.put()
 
     failure_result_map = {}
     need_try_job, last_pass, try_job_type, targeted_tests = (
         try_job_util._NeedANewTryJob(master_name, builder_name, build_number,
                                      failed_steps, failure_result_map))
 
     expected_failure_result_map = {
         'compile': 'm/b/223'
     }
     self.assertTrue(need_try_job)
     self.assertEqual(expected_failure_result_map, failure_result_map)
     self.assertEqual(220, last_pass)
     self.assertEqual(TryJobType.COMPILE, try_job_type)
     self.assertIsNone(targeted_tests)
 
   def testNotNeedANewTryJobIfLastPassCannotDetermine(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failed_steps = {
         'compile': {
             'current_failure': 223,
             'first_failure': 223
         }
     }
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
-    try_job.status = wf_analysis_status.ERROR
+    try_job.status = analysis_status.ERROR
     try_job.put()
 
     failure_result_map = {}
     need_try_job, last_pass, try_job_type, targeted_tests = (
         try_job_util._NeedANewTryJob(master_name, builder_name, build_number,
                                      failed_steps, failure_result_map))
 
     self.assertFalse(need_try_job)
     self.assertEqual({}, failure_result_map)
     self.assertIsNone(last_pass)
@@ skipping 175 matching lines @@
             'failed_targets': [
                 {'source': 'b.cc', 'target': 'b.o'},
             ]
         }
     }
 
     self.assertEqual(
         try_job_util._GetFailedTargetsFromSignals(
             signals, 'master1', 'builder1'),
         ['b.o'])