[Findit] Adding logic to force try jobs regardless of bailout or previous results

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 analysis_status
 from model.wf_analysis import WfAnalysis
@@ skipping 174 matching lines @@
     revision = culprit['revision']
     if organized_culprits.get(revision):
       organized_culprits[revision]['failed_tests'].append(test_name)
     else:
       organized_culprits[revision] = culprit
       organized_culprits[revision]['failed_tests'] = [test_name]
 
   return organized_culprits
 
 
-def _GetCulpritInfoForTryJobResultForTest(try_job_key, culprits_info):
+def _GetCulpritInfoForTryJobResultForTest(try_job_key, culprits_info,
+                                          show_debug_info):
   referred_build_keys = try_job_key.split('/')
   try_job = WfTryJob.Get(*referred_build_keys)
+
   if not try_job or try_job.compile_results:
     return
 
   try_job_result = try_job.test_results[-1] if try_job.test_results else None
 
   for step_try_jobs in culprits_info.values():
     # If try job found different culprits for each test, split tests by culprit.
     additional_tests_culprit_info = []
+
     for try_job_info in step_try_jobs['try_jobs']:
       if (try_job_key != try_job_info['try_job_key']
-          or try_job_info.get('status')):
+          or (try_job_info.get('status') and not show_debug_info)):
         # Conditions that try_job_info has status are:
         # If there is no swarming task, there won't be try job;
         # If the swarming task is not completed yet, there won't be try job yet;
         # If there are flaky tests found, those tests will be marked as flaky,
         # and no try job for them will be triggered.
         continue
 
       try_job_info['status'] = try_job.status
       if try_job_result:
         # Needs to use ref_name to match step_name in try job.
@@ skipping 53 matching lines @@
                 'review_url': iterate_culprit.get(
                     'url', iterate_culprit.get('review_url', None))
             }
             tmp_try_job_info['tests'] = iterate_culprit['failed_tests']
             additional_tests_culprit_info.append(tmp_try_job_info)
 
     if additional_tests_culprit_info:
       step_try_jobs['try_jobs'].extend(additional_tests_culprit_info)
 
 
-def _UpdateTryJobInfoBasedOnSwarming(step_tasks_info, try_jobs):
+def _UpdateTryJobInfoBasedOnSwarming(step_tasks_info, try_jobs,
+                                     show_debug_info=False):
   """
   Args:
     step_tasks_info (dict): A dict of swarming task info for this step.
         It is the result from _GenerateSwarmingTasksData.
     try_jobs (list): A list to save try job data for the step, format as below:
         [
           {
               'try_job_key': 'm/b/120'
           },
           {
               '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'] != analysis_status.COMPLETED:
+    if (task['task_info']['status'] != analysis_status.COMPLETED and
+        not show_debug_info):
       # 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']
+      # Swarming task is completed or a manual try job rerun was triggered.
+      # Group tests according to task result.
+      try_job['ref_name'] = task.get('ref_name')

[chanli, 2016/06/02 23:32:52]

If this is a force-try-job for a non-swarming task, there will not be a  task,
thus no task.get('ref_name'). I think you need to process the step name(strip
the 'on platform'. e.g. unit_tests on Ubuntu-12.04 --> unit_tests)

[lijeffrey, 2016/06/27 22:15:43]

Done.

       if task.get('reliable_tests'):
         try_job['tests'] = task['reliable_tests']
         if task.get('flaky_tests'):
           # Split this try job into two groups: flaky group and reliable group.
           flaky_try_job = copy.deepcopy(try_job)
           flaky_try_job['status'] = result_status.FLAKY
           flaky_try_job['tests'] = task['flaky_tests']
           flaky_try_job['task_id'] = task['task_info']['task_id']
           flaky_try_job['task_url'] = task['task_info']['task_url']
           additional_flakiness_list.append(flaky_try_job)
       elif task.get('flaky_tests'):  # pragma: no cover
         # All Flaky.
         try_job['status'] = result_status.FLAKY
         try_job['tests'] = task['flaky_tests']
 
     if task['task_info'].get('task_id'):
       try_job['task_id'] = task['task_info']['task_id']
       try_job['task_url'] = task['task_info']['task_url']
 
   try_jobs.extend(additional_flakiness_list)
 
 
-def _GetAllTryJobResultsForTest(failure_result_map, tasks_info):
+def _GetAllTryJobResultsForTest(failure_result_map, tasks_info,
+                                show_debug_info=False):
   culprits_info = defaultdict(lambda: defaultdict(list))
   if not tasks_info:
     return culprits_info
 
   try_job_keys = set()
   for step_name, step_failure_result_map in failure_result_map.iteritems():
     try_jobs = culprits_info[step_name]['try_jobs']
 
     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)
     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)
+      if show_debug_info:
+        # Include any forced try jobs trigered manually in debug mode.
+        try_job_keys.add(step_failure_result_map)
+
+    _UpdateTryJobInfoBasedOnSwarming(tasks_info[step_name], try_jobs,
+                                     show_debug_info)
 
   for try_job_key in try_job_keys:
-    _GetCulpritInfoForTryJobResultForTest(try_job_key, culprits_info)
+    _GetCulpritInfoForTryJobResultForTest(try_job_key, culprits_info,
+                                          show_debug_info)
 
   return culprits_info
 
 
 def _GetTryJobResultForCompile(failure_result_map):
   try_job_key = failure_result_map['compile']
   referred_build_keys = try_job_key.split('/')
   culprit_info = defaultdict(lambda: defaultdict(list))
 
   try_job = WfTryJob.Get(*referred_build_keys)
@@ skipping 13 matching lines @@
       compile_try_job['try_job_url'] = try_job_result['url']
       compile_try_job['try_job_build_number'] = (
           _GetTryJobBuildNumber(try_job_result['url']))
     if try_job_result.get('culprit', {}).get('compile'):
       compile_try_job['culprit'] = try_job_result['culprit']['compile']
 
   culprit_info['compile']['try_jobs'].append(compile_try_job)
   return culprit_info
 
 
-def GetAllTryJobResults(master_name, builder_name, build_number):
+def GetAllTryJobResults(master_name, builder_name, build_number,
+                        show_debug_info=False):
   culprits_info = {}
   is_test_failure = True
 
   analysis_result, failure_result_map = _GetFailureResultMap(
       master_name, builder_name, build_number)
 
   if failure_result_map:
     for step_name in failure_result_map:
       if step_name.lower() == 'compile':
         is_test_failure = False
         break
     if is_test_failure:
       tasks_info = _GenerateSwarmingTasksData(failure_result_map)
       culprits_info = _GetAllTryJobResultsForTest(
-          failure_result_map, tasks_info)
+          failure_result_map, tasks_info, show_debug_info)
     else:
       culprits_info = _GetTryJobResultForCompile(failure_result_map)
   elif analysis_result:
     for failure in analysis_result['failures']:
       step_name = failure['step_name']
       tests = []
       for test in failure.get('tests', []):
         tests.append(test['test_name'])
 
       culprits_info[step_name] = {
           'try_jobs': [
               {
                   'status': result_status.NO_FAILURE_RESULT_MAP,
                   'tests': tests
               }
           ]
       }
   return culprits_info