[Findit] Modify result page to display tryjob result for test failure.

appengine/findit/handlers/try_job_result.py

Index: appengine/findit/handlers/try_job_result.py
diff --git a/appengine/findit/handlers/try_job_result.py b/appengine/findit/handlers/try_job_result.py
index 7bceeff552fa2b66f279b42dc1c5ec057866ed82..d8a5117875ccb67f4ad4c06fc4a324ab9878d320 100644
--- a/appengine/findit/handlers/try_job_result.py
+++ b/appengine/findit/handlers/try_job_result.py
@@ -10,34 +10,98 @@ from model.wf_try_job import WfTryJob
 from waterfall import buildbot
 
 
-def _GetTryJobResult(master_name, builder_name, build_number):
-  # Get the latest try job result if it's compile failure.
+def _GetTryJobBuildNumber(url):
+  build_keys = buildbot.ParseBuildUrl(url)
+  return build_keys[2]
+
+
+def _GetCulpritInfoForTryJobResult(try_job_key, culprits_info):
+  referred_build_keys = try_job_key.split('/')
+  try_job = WfTryJob.Get(*referred_build_keys)
+  if not try_job:
+    return
+
+  if try_job.compile_results:
+    try_job_result = try_job.compile_results[-1]
+  elif try_job.test_results:
+    try_job_result = try_job.test_results[-1]
+  else:
+    try_job_result = None
+
+  for culprit_info in culprits_info.values():
+    if culprit_info['try_job_key'] != try_job_key:
+      continue
+
+    culprit_info['status'] = (
+        wf_analysis_status.TRY_JOB_STATUS_TO_DESCRIPTION[try_job.status])
+
+    if try_job_result:
+      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']
+        test = culprit_info['test']
+        if not try_job_culprits.get(step, {}).get('tests'):
+          # Only step level
+          culprit = try_job_culprits[step]
+        elif test in try_job_culprits.get(step).get('tests'):
+          culprit = try_job_culprits[step]['tests'][test]
+        else:   # pragma: no cover
+          continue  # No culprit for test found.
+
+        culprit_info['revision'] = culprit.get('revision')
+        culprit_info['commit_position'] = culprit.get('commit_position')
+        culprit_info['review_url'] = culprit.get('review_url')
+
+
+def _GetAllTryJobResults(master_name, builder_name, build_number):
+  culprits_info = {}
+  try_job_keys = []
+
   analysis = WfAnalysis.Get(master_name, builder_name, build_number)
   if not analysis:
-    return {}
+    return culprits_info
 
   failure_result_map = analysis.failure_result_map
+  if failure_result_map:
+    # failure_result_map uses step_names as keys and saves referred try_job_keys
+    # If non-swarming, step_name and referred_try_job_key match directly as:
+    # step_name: try_job_key
+    # If swarming, add one more layer of tests, so the format would be:
+    # step_name: {
+    #     test_name1: try_job_key1,
+    #     test_name2: try_job_key2,
+    #     ...
+    # }
+    for failed_step in failure_result_map:
+      if isinstance(failure_result_map[failed_step], dict):
+        for failed_test, try_job_key in (
+            failure_result_map[failed_step].iteritems()):
+          step_test_key = '%s-%s' % (failed_step, failed_test)
+          culprits_info[step_test_key] = {
+              'step': failed_step,
+              'test': failed_test,
+              'try_job_key': try_job_key
+          }
+          if try_job_key not in try_job_keys:
+            try_job_keys.append(try_job_key)
+      else:
+        culprits_info[failed_step] = {
+            'step': failed_step,
+            'test': 'N/A',
+            'try_job_key': failure_result_map[failed_step]
+        }
+        if (failure_result_map[failed_step] not in
+            try_job_keys):  # pragma: no cover
+          try_job_keys.append(failure_result_map[failed_step])
+
+    for try_job_key in try_job_keys:
+      _GetCulpritInfoForTryJobResult(try_job_key, culprits_info)
 
-  if failure_result_map and failure_result_map.get('compile'):
-    try_job_key = failure_result_map['compile']
-    point_build_keys = try_job_key.split('/')
-    try_job = WfTryJob.Get(
-          point_build_keys[0], point_build_keys[1], point_build_keys[2])
-    if try_job:
-      try_job_result = {}
-      try_job_result['status'] = (
-          wf_analysis_status.STATUS_TO_DESCRIPTION[try_job.status])
-      if try_job.compile_results:
-        if try_job.compile_results[-1].get('culprit'):
-          culprit = try_job.compile_results[-1]['culprit']
-          try_job_result['revision'] = culprit['revision']
-          try_job_result['commit_position'] = culprit['commit_position']
-          try_job_result['review_url'] = culprit['review_url']
-        if try_job.compile_results[-1].get('url'):
-          try_job_result['try_job_url'] = try_job.compile_results[-1]['url']
-      return try_job_result
-
-  return {}
+  return culprits_info
 
 
 class TryJobResult(BaseHandler):
@@ -51,7 +115,7 @@ class TryJobResult(BaseHandler):
     if not build_keys:  # pragma: no cover
       return {'data': {}}
 
-    data = _GetTryJobResult(*build_keys)
+    data = _GetAllTryJobResults(*build_keys)
 
     return {'data': data}