[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.
 
 from google.appengine.ext import ndb
 
 from model.flake.master_flake_analysis import MasterFlakeAnalysis
 from model.versioned_model import VersionedModel
 
 
@@ skipping 110 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):
+    # Returns the analysis that corresponds to the requested master and builder.
+    normalized_master_name, normalized_builder_name = (
+        self._GetNormalizedConfigurationNames(master_name, builder_name))
+
+    if not normalized_master_name or not normalized_builder_name:

[chanli, 2016/11/18 21:02:46]

Essentially _GetNormalizedConfigurationNames will return the same master_name
and builder_name as the parameters if match found, right? So this function seems
unnecessary to me? we can just compare them with analysis's configuration,
right?

[lijeffrey, 2016/11/19 01:00:25]

Not necessarily, build_step.master_name might != build_step.wf_master_name if
original master_name is from CQ. master_name is assumed to be from the
originally requested source, but will also save the equivalent wf_master_name
too to ensure we find the correct match

+      return None
+
+    for analysis_key in self.analyses:
+      components = analysis_key.pairs()[0][1].split('/')

[stgao, 2016/11/18 21:03:00]

How about moving this logic to the MasterFlakeAnalysis class?

[lijeffrey, 2016/11/19 01:00:25]

Done.

+      analysis_master_name = components[0]
+      analysis_builder_name = components[1]
+
+      if (analysis_master_name == normalized_master_name and
+          analysis_builder_name == normalized_builder_name):
+        return analysis_key.get()
+
+    return None