[Findit] A huge refactoring and some bug fixing.

appengine/findit/test/findit_api_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
 
 import endpoints
 from google.appengine.api import taskqueue
 
 from testing_utils import testing
 
 import findit_api
 from findit_api import FindItApi
 from model.wf_analysis import WfAnalysis
-from model import wf_analysis_status
+from model import analysis_status
 from waterfall import waterfall_config
 
 
 class FinditApiTest(testing.EndpointsTestCase):
   api_service_cls = FindItApi
 
   def setUp(self):
     super(FinditApiTest, self).setUp()
     self.taskqueue_requests = []
     def Mocked_taskqueue_add(**kwargs):
@@ skipping 76 matching lines @@
         'builds': [
             {
                 'master_url': master_url,
                 'builder_name': builder_name,
                 'build_number': build_number
             }
         ]
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
-    analysis.status = wf_analysis_status.ERROR
+    analysis.status = analysis_status.ERROR
     analysis.result = {
         'failures': [
             {
                 'step_name': 'test',
                 'first_failure': 3,
                 'last_pass': 1,
                 'suspected_cls': [
                     {
                         'repo_name': 'chromium',
                         'revision': 'git_hash',
@@ skipping 23 matching lines @@
         'builds': [
             {
                 'master_url': master_url,
                 'builder_name': builder_name,
                 'build_number': build_number
             }
         ]
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
-    analysis.status = wf_analysis_status.ANALYZING
+    analysis.status = analysis_status.RUNNING
     analysis.result = None
     analysis.put()
 
     expected_result = []
 
     self._MockMasterIsSupported(supported=True)
 
     response = self.call_api('AnalyzeBuildFailures', body=builds)
     self.assertEqual(200, response.status_int)
     self.assertEqual(expected_result, response.json_body.get('results', []))
@@ skipping 45 matching lines @@
                 {
                     'repo_name': 'chromium',
                     'revision': 'git_hash',
                     'commit_position': 123,
                 }
             ]
         },
     ]
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
-    analysis.status = wf_analysis_status.ANALYZING
+    analysis.status = analysis_status.RUNNING
     analysis.result = analysis_result
     analysis.put()
 
     response = self.call_api('AnalyzeBuildFailures', body=builds)
     self.assertEqual(200, response.status_int)
     self.assertEqual(expected_results, response.json_body['results'])
 
   def testAnalysisFindingNoSuspectedCLsIsNotReturned(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 5
 
     master_url = 'https://build.chromium.org/p/%s' % master_name
     builds = {
         'builds': [
             {
                 'master_url': master_url,
                 'builder_name': builder_name,
                 'build_number': build_number
             }
         ]
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
-    analysis.status = wf_analysis_status.ANALYZED
+    analysis.status = analysis_status.COMPLETED
     analysis.result = {
         'failures': [
             {
                 'step_name': 'test',
                 'first_failure': 3,
                 'last_pass': 1,
                 'suspected_cls': []
             }
         ]
     }
@@ skipping 17 matching lines @@
         'builds': [
             {
                 'master_url': master_url,
                 'builder_name': builder_name,
                 'build_number': build_number
             }
         ]
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
-    analysis.status = wf_analysis_status.ANALYZED
+    analysis.status = analysis_status.COMPLETED
     analysis.result = {
         'failures': [
             {
                 'step_name': 'test',
                 'first_failure': 3,
                 'last_pass': 1,
                 'suspected_cls': [
                     {
                         'build_number': 2,
                         'repo_name': 'chromium',
@@ skipping 61 matching lines @@
         'builds': [
             {
                 'master_url': master_url,
                 'builder_name': builder_name,
                 'build_number': build_number
             }
         ]
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
-    analysis.status = wf_analysis_status.ANALYZED
+    analysis.status = analysis_status.COMPLETED
     analysis.result = {
         'failures': [
             {
                 'step_name': 'a',
                 'first_failure': 4,
                 'last_pass': 3,
                 'suspected_cls': [
                     {
                         'build_number': 4,
                         'repo_name': 'chromium',
@@ skipping 168 matching lines @@
                 'master_name': master_name,
                 'builder_name': builder_name,
                 'build_number': build_number,
                 'failed_steps': [],
             },
         ]
     }
     self.assertEqual(
         expected_payload_json,
         json.loads(self.taskqueue_requests[0].get('payload')))