[Findit] Fix bug when displaying try job result for swamring tests.

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 model import wf_analysis_status
 from model.wf_analysis import WfAnalysis
 from model.wf_swarming_task import WfSwarmingTask
@@ skipping 128 matching lines @@
         wf_analysis_status.TRY_JOB_STATUS_TO_DESCRIPTION[try_job.status]
         if not culprit_info.get('status') else culprit_info['status'])
 
     if try_job_result and culprit_info['status'] != FLAKY:
       if try_job_result.get('url'):
         culprit_info['try_job_url'] = try_job_result['url']
         culprit_info['try_job_build_number'] = (
             _GetTryJobBuildNumber(try_job_result['url']))
       if try_job_result.get('culprit'):
         try_job_culprits = try_job_result['culprit']
-        step = culprit_info['step']
+        step = culprit_info.get('step_no_platform', culprit_info['step'])

[stgao, 2016/03/21 18:01:16]

nit: is this a step name or a dict containing info about the step?
Same for ``test`` below.

         test = culprit_info['test']
 
         if test == 'N/A':  # Only step level.
           if try_job_culprits.get(step, {}).get('tests'):
             # try job results has specified tests.
             step_culprits = try_job_culprits[step]['tests']
             for test_name, try_job_culprit in step_culprits.iteritems():
               additional_test_key = '%s-%s' % (step, test_name)
               additional_tests_culprit_info[additional_test_key] = {
                   'step': step,
@@ skipping 19 matching lines @@
         culprit_info['revision'] = culprit.get('revision')
         culprit_info['commit_position'] = culprit.get('commit_position')
         culprit_info['review_url'] = culprit.get('review_url')
 
   if additional_tests_culprit_info:
     for key, test_culprit_info in additional_tests_culprit_info.iteritems():
       culprits_info.pop(test_culprit_info['step'], None)
       culprits_info[key] = test_culprit_info
 
 
-def _UpdateFlakiness(step_name, failure_key_set, culprits_info):
+def _UpdateTryJobCulpritUsingSwarmingTask(
+    step_name, failure_key_set, culprits_info):
   for failure_key in failure_key_set:
     build_keys = failure_key.split('/')
     task = WfSwarmingTask.Get(*build_keys, step_name=step_name)
     if not task:
       continue
     classified_tests = task.classified_tests
+    step_no_platform = task.parameters.get(
+        'ref_name', step_name.split()[0])
     for culprit_info in culprits_info.values():
       if (culprit_info['try_job_key'] == failure_key and
-          culprit_info['test'] in classified_tests.get('flaky_tests', [])):
-        culprit_info['status'] = FLAKY
+          step_name == culprit_info['step']):
+        culprit_info['step_no_platform'] = step_no_platform
+        if culprit_info['test'] in classified_tests.get('flaky_tests', []):
+          culprit_info['status'] = FLAKY
 
 
 def GetAllTryJobResults(master_name, builder_name, build_number):
   culprits_info = {}
   try_job_keys = set()
 
   analysis = WfAnalysis.Get(master_name, builder_name, build_number)
   if not analysis:
     return culprits_info
 
@@ skipping 13 matching lines @@
         step_refering_keys = set()
         for failed_test, try_job_key in step_failure_result_map.iteritems():
           step_test_key = '%s-%s' % (step_name, failed_test)
           culprits_info[step_test_key] = {
               'step': step_name,
               'test': failed_test,
               'try_job_key': try_job_key
           }
           step_refering_keys.add(try_job_key)
 
-        _UpdateFlakiness(step_name, step_refering_keys, culprits_info)
+        _UpdateTryJobCulpritUsingSwarmingTask(
+            step_name, step_refering_keys, culprits_info)
         try_job_keys.update(step_refering_keys)
       else:
         culprits_info[step_name] = {
             'step': step_name,
             'test': 'N/A',
             'try_job_key': step_failure_result_map
         }
         try_job_keys.add(step_failure_result_map)
 
     for try_job_key in try_job_keys:
       _GetCulpritInfoForTryJobResult(try_job_key, culprits_info)
 
   return culprits_info