[Findit] A huge refactoring and some bug fixing.

appengine/findit/waterfall/test/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.
 
 import json
 
 from common import buildbucket_client
 from common.git_repository import GitRepository
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_try_job import WfTryJob
 from pipeline_wrapper import pipeline_handlers
 from waterfall.test import wf_testcase
 from waterfall.try_job_pipeline import TryJobPipeline
 from waterfall.try_job_type import TryJobType
 
 
 class TryJobPipelineTest(wf_testcase.WaterfallTestCase):
   app_module = pipeline_handlers._APP
 
@@ skipping 123 matching lines @@
     build_number = 1
 
     WfTryJob.Create(master_name, builder_name, build_number).put()
 
     root_pipeline = TryJobPipeline(
         master_name, builder_name, build_number, 'rev1', 'rev2', ['rev2'],
         TryJobType.COMPILE, [])
     root_pipeline._LogUnexpectedAbort(True)
 
     try_job = WfTryJob.Get(master_name, builder_name, build_number)
-    self.assertEqual(wf_analysis_status.ERROR, try_job.status)
+    self.assertEqual(analysis_status.ERROR, try_job.status)
 
   def testPipelineAbortedWithOutTryJobResult(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
 
     root_pipeline = TryJobPipeline(
         master_name, builder_name, build_number, 'rev1', 'rev2', ['rev2'],
         TryJobType.COMPILE, [])
     root_pipeline._LogUnexpectedAbort(True)
 
     try_job = WfTryJob.Get(master_name, builder_name, build_number)
 
     self.assertIsNone(try_job)