[Findit] Fixing analysis mismatch in check flake

appengine/findit/model/flake/flake_analysis_request.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.
 
+import logging
+
 from google.appengine.ext import ndb
 
 from model.flake.master_flake_analysis import MasterFlakeAnalysis
 from model.versioned_model import VersionedModel
 
 
 class BuildStep(ndb.Model):
   """Represents a build step on Waterfall or Commit Queue.
 
   For a build step on Commit Queue, the matching Waterfall build step could be
@@ skipping 106 matching lines @@
     return True
 
   def CopyFrom(self, other):
     """Copies all states from the given request."""
     assert isinstance(other, FlakeAnalysisRequest)
     self.is_step = other.is_step
     self.bug_id = other.bug_id
     self.user_emails = other.user_emails
     self.build_steps = other.build_steps
     self.analyses = other.analyses
+
+  def _GetNormalizedConfigurationNames(self, master_name, builder_name):
+    for build_step in self.build_steps:
+      if ((build_step.master_name == master_name and
+           build_step.builder_name == builder_name) or
+          (build_step.wf_master_name == master_name and
+           build_step.wf_builder_name == builder_name)):
+        return build_step.wf_master_name, build_step.wf_builder_name
+    return None, None
+
+  def FindMatchingAnalysisForConfiguration(self, master_name, builder_name):
+    normalized_master_name, normalized_builder_name = (
+        self._GetNormalizedConfigurationNames(master_name, builder_name))
+
+    if not normalized_builder_name or not normalized_master_name:
+      return None
+
+    for analysis_key in self.analyses:
+      analysis = analysis_key.get()

[stgao, 2016/11/18 17:33:42]

Based on the key, we could derive master/builder name, builder number, etc.
I guess the ndb read here could be avoided.

[lijeffrey, 2016/11/18 20:47:33]

Done.

+
+      if not analysis:  # pragma: no cover
+        logging.error('Analysis was deleted unexpectedly!')
+        return None

[chanli, 2016/11/18 19:15:28]

If one analysis is deleted, I agree we should log the error, but do we need to
return here? Maybe we'll find another analysis? Although after the change
suggested by Shuotao, this will not be necessary

[lijeffrey, 2016/11/18 20:47:33]

Done.

+      if (analysis.master_name == normalized_master_name and
+          analysis.builder_name == normalized_builder_name):
+        return analysis
+
+    return None