[Findit] A huge refactoring and some bug fixing.

appengine/findit/handlers/handlers_util.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 collections import defaultdict
 import copy
 
 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 import buildbot
 from waterfall import waterfall_config
 
 
 def _GetFailureResultMap(master_name, builder_name, build_number):
   analysis = WfAnalysis.Get(master_name, builder_name, build_number)
   if not analysis:
@@ skipping 271 matching lines @@
               'try_job_key': 'm/b/121'
           },
           ...
         ]
   """
   additional_flakiness_list = []
   for try_job in try_jobs:
     try_job_key = try_job['try_job_key']
     task = step_tasks_info.get('swarming_tasks', {}).get(try_job_key)
 
-    if task['task_info']['status'] != wf_analysis_status.ANALYZED:
+    if task['task_info']['status'] != analysis_status.COMPLETED:
       # There is someting wrong with swarming task or it's not done yet,
       # no try job yet or ever.
       try_job['status'] = result_status.NO_TRY_JOB_REASON_MAP[
           task['task_info']['status']]
       try_job['tests'] = task.get('all_tests', [])
     else:
       # Swarming task is completed, group tests according to task result.
       try_job['ref_name'] = task['ref_name']
       if task.get('reliable_tests'):
         try_job['tests'] = task['reliable_tests']
@@ skipping 28 matching lines @@
 
     if isinstance(step_failure_result_map, dict):
       step_try_job_keys = set()
       for try_job_key in step_failure_result_map.values():
         if try_job_key not in step_try_job_keys:
           try_job_dict = {
               'try_job_key': try_job_key
           }
           try_jobs.append(try_job_dict)
           step_try_job_keys.add(try_job_key)
-        try_job_keys.update(step_try_job_keys)
+      try_job_keys.update(step_try_job_keys)
     else:
       # Try job should only be triggered for swarming tests, because we cannot
       # identify flaky tests for non-swarming tests.
       try_job_dict = {
           'try_job_key': step_failure_result_map
       }
       try_jobs.append(try_job_dict)
 
     _UpdateTryJobInfoBasedOnSwarming(tasks_info[step_name], try_jobs)
 
@@ skipping 59 matching lines @@
 
       culprits_info[step_name] = {
           'try_jobs': [
               {
                   'status': result_status.NO_FAILURE_RESULT_MAP,
                   'tests': tests
               }
           ]
       }
   return culprits_info