[Findit] Change the criteria of sending notification to code review.

appengine/findit/waterfall/identify_try_job_culprit_pipeline.py

 # Copyright 2015 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 logging
 
 from google.appengine.ext import ndb
 
 from common.git_repository import GitRepository
@@ skipping 164 matching lines @@
       for failed_test in test_result['failures']:
         # Swarming tests, gets first failed revision for each test.
         if failed_test not in culprit_map[step]['tests']:
           culprit_map[step]['tests'][failed_test] = {
               'revision': revision
           }
 
   return culprit_map, list(failed_revisions)
 
 
-def _NotifyCulprits(master_name, builder_name, build_number, culprits):
+def _GetHeuristicSuspectedCLs(analysis):
+  """Gets revisions of suspected cls found by heuristic approach."""
+  if analysis and analysis.suspected_cls:
+    return [(cl['repo_name'], cl['revision']) for cl in analysis.suspected_cls]
+  return []
+
+
+def _NotifyCulprits(master_name, builder_name, build_number, culprits,
+                    heuristic_cls):
   """Sends notifications to the identified culprits."""
-  try:
-    for culprit in (culprits or {}).itervalues():
-      pipeline = SendNotificationForCulpritPipeline(
+
+  for culprit in (culprits or {}).itervalues():
+    if ((culprit['repo_name'], culprit['revision']) in heuristic_cls):

[lijeffrey, 2016/09/02 06:37:34]

nit: it looks like there are some unnecessary parenthesis around this if

[chanli, 2016/09/02 16:57:19]

Done.

+      try:
+        pipeline = SendNotificationForCulpritPipeline(
           master_name, builder_name, build_number,
           culprit['repo_name'], culprit['revision'])
-      pipeline.start()
-  except Exception:  # pragma: no cover.
-    logging.exception('Failed to notify culprits.')
+        pipeline.start()
+      except Exception:  # pragma: no cover.
+        logging.exception(
+            'Failed to notify culprits which was found by both approaches.')
 
 
 class IdentifyTryJobCulpritPipeline(BasePipeline):
   """A pipeline to identify culprit CL info based on try job compile results."""
 
   def _GetCulpritInfo(self, failed_revisions):
     """Gets commit_positions and review urls for revisions."""
     culprits = {}
     # TODO(lijeffrey): remove hard-coded 'chromium' when DEPS file parsing is
     # supported.
@@ skipping 112 matching lines @@
       try_job_result.status = analysis_status.COMPLETED
       try_job_result.put()
 
     @ndb.transactional
     def UpdateWfAnalysisWithTryJobResult():
       if not culprits:
         return
 
       # Update analysis result and suspected CLs with results of this try job if
       # culprits were found.
-      analysis = WfAnalysis.Get(master_name, builder_name, build_number)
       updated_result_status = _GetResultAnalysisStatus(analysis, result)
       updated_suspected_cls = _GetSuspectedCLs(analysis, result)
 
       if (analysis.result_status != updated_result_status or
           analysis.suspected_cls != updated_suspected_cls):
         analysis.result_status = updated_result_status
         analysis.suspected_cls = updated_suspected_cls
         analysis.put()
 
-    # Store try-job results.
+      # Store try-job results.
     UpdateTryJobResult()
+
+
+    analysis = WfAnalysis.Get(master_name, builder_name, build_number)
+    heuristic_cls = _GetHeuristicSuspectedCLs(analysis)
+
     # Add try-job results to WfAnalysis.
     UpdateWfAnalysisWithTryJobResult()
 
-    _NotifyCulprits(master_name, builder_name, build_number, culprits)
+    _NotifyCulprits(master_name, builder_name, build_number, culprits,
+                    heuristic_cls)
     return result.get('culprit') if result else None