[Findit] A huge refactoring and some bug fixing.

appengine/findit/handlers/test/handlers_util_test.py

 # Copyright 2016 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 handlers import handlers_util
 from handlers import result_status
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_analysis import WfAnalysis
 from model.wf_swarming_task import WfSwarmingTask
 from model.wf_try_job import WfTryJob
 from waterfall.test import wf_testcase
 
 
 class HandlersUtilResultTest(wf_testcase.WaterfallTestCase):
 
   def setUp(self):
     super(HandlersUtilResultTest, self).setUp()
@@ skipping 127 matching lines @@
         'step2': {
             'test1': '%s/%s/%s' % (
                 self.master_name, self.builder_name, self.build_number)
         }
     }
     analysis.put()
 
     task0 = WfSwarmingTask.Create(
         self.master_name, self.builder_name, 120, 'step1 on platform')
     task0.task_id = 'task0'
-    task0.status = wf_analysis_status.ANALYZED
+    task0.status = analysis_status.COMPLETED
     task0.parameters = {
         'tests': ['test1']
     }
     task0.tests_statuses = {
         'test1': {
             'total_run': 2,
             'FAILURE': 2
         }
     }
     task0.put()
 
     task1 = WfSwarmingTask.Create(
         self.master_name, self.builder_name, self.build_number,
         'step1 on platform')
     task1.task_id = 'task1'
-    task1.status = wf_analysis_status.ANALYZED
+    task1.status = analysis_status.COMPLETED
     task1.parameters = {
         'tests': ['test2', 'test3', 'test4']
     }
     task1.tests_statuses = {
         'test2': {
             'total_run': 2,
             'FAILURE': 2
         },
         'test3': {
             'total_run': 4,
@@ skipping 12 matching lines @@
     task2.put()
 
     data = handlers_util.GetSwarmingTaskInfo(
         self.master_name, self.builder_name, self.build_number)
 
     expected_data = {
         'step1 on platform': {
             'swarming_tasks': {
                 'm/b/121': {
                     'task_info': {
-                        'status': wf_analysis_status.ANALYZED,
+                        'status': analysis_status.COMPLETED,
                         'task_id': 'task1',
                         'task_url': ('https://chromium-swarm.appspot.com/user'
                                      '/task/task1')
                     },
                     'all_tests': ['test2', 'test3', 'test4'],
                     'reliable_tests': ['test2'],
                     'flaky_tests': ['test3', 'test4'],
                     'ref_name': 'step1'
                 },
                 'm/b/120': {
                     'task_info': {
-                        'status': wf_analysis_status.ANALYZED,
+                        'status': analysis_status.COMPLETED,
                         'task_id': 'task0',
                         'task_url': ('https://chromium-swarm.appspot.com/user/'
                                      'task/task0')
                     },
                     'all_tests': ['test1'],
                     'reliable_tests': ['test1'],
                     'flaky_tests': [],
                     'ref_name': 'step1'
                 }
             }
         },
         'step2': {
             'swarming_tasks': {
                 'm/b/121': {
                     'task_info': {
-                        'status': wf_analysis_status.PENDING
+                        'status': analysis_status.PENDING
                     },
                     'all_tests': ['test1'],
                     'ref_name': 'step2'
                 }
             }
         }
     }
     self.assertEqual(expected_data, data)
 
   def testGetAllTryJobResultsNoAnalysis(self):
@@ skipping 60 matching lines @@
     WfTryJob.Create(
         self.master_name, self.builder_name, self.build_number).put()
 
     result = handlers_util._GetTryJobResultForCompile({'compile': 'm/b/121'})
 
     expected_result = {
         'compile': {
             'try_jobs': [
                 {
                     'try_job_key': 'm/b/121',
-                    'status': wf_analysis_status.PENDING
+                    'status': analysis_status.PENDING
                 }
             ]
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultForCompileOnlyReturnUrlIfStarts(self):
     try_job = WfTryJob.Create(
         self.master_name, self.builder_name, self.build_number)
-    try_job.status = wf_analysis_status.ANALYZING
+    try_job.status = analysis_status.RUNNING
     try_job.compile_results = [
         {
             'result': None,
             'url': ('http://build.chromium.org/p/tryserver.chromium.linux/'
                     'builders/linux_chromium_variable/builds/121')
         }
     ]
     try_job.put()
 
     result = handlers_util._GetTryJobResultForCompile({'compile': 'm/b/121'})
 
     expected_result = {
         'compile': {
             'try_jobs': [
                 {
                     'try_job_key': 'm/b/121',
-                    'status': wf_analysis_status.ANALYZING,
+                    'status': analysis_status.RUNNING,
                     'try_job_build_number': 121,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121')
                 }
             ]
         }
     }
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultForCompileOnlyReturnStatusIfError(self):
     try_job = WfTryJob.Create(
         self.master_name, self.builder_name, self.build_number)
-    try_job.status = wf_analysis_status.ERROR
+    try_job.status = analysis_status.ERROR
     try_job.compile_results = [
         {
             'try_job_id': '1'
         }
     ]
     try_job.put()
 
     result = handlers_util._GetTryJobResultForCompile({'compile': 'm/b/121'})
 
     expected_result = {
         'compile': {
             'try_jobs': [
                 {
                     'try_job_key': 'm/b/121',
-                    'status': wf_analysis_status.ERROR
+                    'status': analysis_status.ERROR
                 }
             ]
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultWhenTryJobCompleted(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
     analysis.failure_result_map = {
         'compile': 'm/b/121'
     }
     analysis.put()
 
     try_job = WfTryJob.Create(
         self.master_name, self.builder_name, self.build_number)
-    try_job.status = wf_analysis_status.ANALYZED
+    try_job.status = analysis_status.COMPLETED
     try_job.compile_results = [
         {
             'report': {
                 'result': {
                     'rev1': 'passed',
                     'rev2': 'failed'
                 }
             },
             'try_job_id': 'm/b/121',
             'url': ('http://build.chromium.org/p/tryserver.chromium.'
@@ skipping 10 matching lines @@
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
             'try_jobs': [
                 {
                     'try_job_key': 'm/b/121',
-                    'status': wf_analysis_status.ANALYZED,
+                    'status': analysis_status.COMPLETED,
                     'try_job_build_number': 121,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121'),
                     'culprit': {
                         'revision': 'rev2',
                         'commit_position': '2',
                         'review_url': 'url_2'
                     }
                 }
             ]
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultWhenTryJobCompletedAllPassed(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
     analysis.failure_result_map = {
         'compile': 'm/b/121'
     }
     analysis.put()
 
     try_job = WfTryJob.Create(
         self.master_name, self.builder_name, self.build_number)
-    try_job.status = wf_analysis_status.ANALYZED
+    try_job.status = analysis_status.COMPLETED
     try_job.compile_results = [
         {
             'report': {
                 'result': {
                     'rev1': 'passed',
                     'rev2': 'failed'
                 },
             },
             'url': ('http://build.chromium.org/p/tryserver.chromium.linux/'
                     'builders/linux_chromium_variable/builds/121')
         }
     ]
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
             'try_jobs': [
                 {
                     'try_job_key': 'm/b/121',
-                    'status': wf_analysis_status.ANALYZED,
+                    'status': analysis_status.COMPLETED,
                     'try_job_build_number': 121,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121')
                 }
             ]
         }
     }
 
     self.assertEqual(expected_result, result)
@@ skipping 77 matching lines @@
             'test1': 'm/b/118',
             'test3': 'm/b/119'
         }
     }
 
     tasks_info = {
         'step1': {
             'swarming_tasks': {
                 'm/b/118': {
                     'task_info': {
-                        'status': wf_analysis_status.PENDING
+                        'status': analysis_status.PENDING
                     },
                     'all_tests': ['test1']
                 },
                 'm/b/119': {
                     'task_info': {
-                        'status': wf_analysis_status.ANALYZING,
+                        'status': analysis_status.RUNNING,
                         'task_id': 'task3',
                         'task_url': 'task3_url'
                     },
                     'all_tests': ['test3']
                 }
             }
         }
     }
 
     result = handlers_util._GetAllTryJobResultsForTest(
         failure_result_map, tasks_info)
 
     expected_result = {
         'step1': {
             'try_jobs': [
                 {
                     'try_job_key': 'm/b/118',
                     'status': result_status.NO_TRY_JOB_REASON_MAP[
-                        wf_analysis_status.PENDING],
+                        analysis_status.PENDING],
                     'tests': ['test1']
                 },
                 {
                     'try_job_key': 'm/b/119',
                     'status': result_status.NO_TRY_JOB_REASON_MAP[
-                        wf_analysis_status.ANALYZING],
+                        analysis_status.RUNNING],
                     'task_id': 'task3',
                     'task_url': 'task3_url',
                     'tests': ['test3']
                 }
             ]
         }
     }
     self.assertEqual(expected_result, result)
 
   def testUpdateTryJobInfoBasedOnSwarmingAllFlaky(self):
     step_tasks_info = {
         'swarming_tasks': {
             'm/b/119': {
                 'task_info': {
-                    'status': wf_analysis_status.ANALYZED,
+                    'status': analysis_status.COMPLETED,
                     'task_id': 'task1',
                     'task_url': 'task_url'
                 },
                 'all_tests': ['test2', 'test3'],
                 'reliable_tests': [],
                 'flaky_tests': ['test2', 'test3'],
                 'ref_name': 'step1'
             }
         }
     }
@@ skipping 24 matching lines @@
         'step1 on platform': {
             'test3': 'm/b/119'
         }
     }
 
     tasks_info = {
         'step1 on platform': {
             'swarming_tasks': {
                 'm/b/119': {
                     'task_info': {
-                        'status': wf_analysis_status.ANALYZED,
+                        'status': analysis_status.COMPLETED,
                         'task_id': 'task1',
                         'task_url': ('https://chromium-swarm.appspot.com/user'
                                      '/task/task1')
                     },
                     'all_tests': ['test3'],
                     'reliable_tests': ['test3'],
                     'flaky_tests': [],
                     'ref_name': 'step1'
                 }
             }
         }
     }
 
     try_job = WfTryJob.Create('m', 'b', 119)
-    try_job.status = wf_analysis_status.ANALYZED
+    try_job.status = analysis_status.COMPLETED
     try_job.test_results = [
         {
             'report': {
                 'result': {
                     'rev1': {
                         'step1': {
                             'status': 'passed',
                             'valid': True
                         }
                     },
@@ skipping 26 matching lines @@
 
     result = handlers_util._GetAllTryJobResultsForTest(
         failure_result_map, tasks_info)
 
     expected_result = {
         'step1 on platform': {
             'try_jobs': [
                 {
                     'ref_name': 'step1',
                     'try_job_key': 'm/b/119',
-                    'status': wf_analysis_status.ANALYZED,
+                    'status': analysis_status.COMPLETED,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121'),
                     'try_job_build_number': 121,
                     'culprit': {
                         'revision': 'rev2',
                         'commit_position': '2',
                         'review_url': 'url_2'
                     },
                     'task_id': 'task1',
@@ skipping 14 matching lines @@
             'test3': 'm/b/119',
             'test4': 'm/b/119'
         }
     }
 
     tasks_info = {
         'step1 on platform': {
             'swarming_tasks': {
                 'm/b/119': {
                     'task_info': {
-                        'status': wf_analysis_status.ANALYZED,
+                        'status': analysis_status.COMPLETED,
                         'task_id': 'task1',
                         'task_url': 'url/task1'
                     },
                     'all_tests': ['test2', 'test3', 'test4'],
                     'reliable_tests': ['test2', 'test3'],
                     'flaky_tests': ['test4'],
                     'ref_name': 'step1'
                 },
                 'm/b/118': {
                     'task_info': {
                         'status': result_status.NO_SWARMING_TASK_FOUND
                     },
                     'all_tests': ['test1']
                 }
             }
         }
     }
 
     try_job = WfTryJob.Create('m', 'b', 119)
-    try_job.status = wf_analysis_status.ANALYZED
+    try_job.status = analysis_status.COMPLETED
     try_job.test_results = [
         {
             'report': {
                 'result': {
                     'rev1': {
                         'step1': {
                             'status': 'passed',
                             'valid': True
                         }
                     },
@@ skipping 34 matching lines @@
                     'try_job_key': 'm/b/118',
                     'status': result_status.NO_TRY_JOB_REASON_MAP.get(
                         result_status.NO_SWARMING_TASK_FOUND),
                     'tests': ['test1']
                 },
                 {
                     'ref_name': 'step1',
                     'try_job_key': 'm/b/119',
                     'task_id': 'task1',
                     'task_url': 'url/task1',
-                    'status': wf_analysis_status.ANALYZED,
+                    'status': analysis_status.COMPLETED,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121'),
                     'try_job_build_number': 121,
                     'tests': ['test3'],
                     'culprit': {}
                 },
                 {
                     'ref_name': 'step1',
                     'try_job_key': 'm/b/119',
                     'task_id': 'task1',
                     'task_url': 'url/task1',
-                    'status': wf_analysis_status.ANALYZED,
+                    'status': analysis_status.COMPLETED,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121'),
                     'try_job_build_number': 121,
                     'culprit': {
                         'revision': 'rev2',
                         'commit_position': '2',
                         'review_url': 'url_2'
                     },
                     'tests': ['test2']
@@ skipping 58 matching lines @@
     handlers_util._GetCulpritInfoForTryJobResultForTest(
         try_job_key, culprits_info)
 
     expected_culprits_info = {
         'step1 on platform': {
             'try_jobs': [
                 {
                     'ref_name': 'step1',
                     'try_job_key': try_job_key,
                     'tests': ['test2', 'test3'],
-                    'status': wf_analysis_status.PENDING
+                    'status': analysis_status.PENDING
                 }
             ]
         }
     }
     self.assertEqual(expected_culprits_info, culprits_info)
 
   def testGetCulpritInfoForTryJobResultForTestTryJobRunning(self):
     try_job_key = 'm/b/119'
     culprits_info = {
         'step1 on platform': {
             'try_jobs': [
                 {
                     'ref_name': 'step1',
                     'try_job_key': try_job_key,
                     'tests': ['test2', 'test3']
                 }
             ]
         }
     }
     try_job = WfTryJob.Create('m', 'b', '119')
-    try_job.status = wf_analysis_status.ANALYZING
+    try_job.status = analysis_status.RUNNING
     try_job.test_results = [
         {
             'url': ('http://build.chromium.org/p/tryserver.chromium.'
                     'linux/builders/linux_chromium_variable/builds/121'),
             'try_job_id': '121'
         }
     ]
     try_job.put()
     handlers_util._GetCulpritInfoForTryJobResultForTest(
         try_job_key, culprits_info)
 
     expected_culprits_info = {
         'step1 on platform': {
             'try_jobs': [
                 {
                     'ref_name': 'step1',
                     'try_job_key': try_job_key,
                     'tests': ['test2', 'test3'],
-                    'status': wf_analysis_status.ANALYZING,
+                    'status': analysis_status.RUNNING,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121'),
                     'try_job_build_number': 121
                 }
             ]
         }
     }
     self.assertEqual(expected_culprits_info, culprits_info)