[Findit] Fixing analysis mismatch in check flake

appengine/findit/handlers/flake/check_flake.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.api import users
 from google.appengine.ext import ndb
 
 from common import auth_util
 from common.base_handler import BaseHandler
 from common.base_handler import Permission
 from lib import time_util
 from model import analysis_status
 from model import triage_status
 from model.flake.flake_analysis_request import FlakeAnalysisRequest
@@ skipping 79 matching lines @@
       user_email = auth_util.GetUserEmail()
       is_admin = auth_util.IsCurrentUserAdmin()
 
       request = FlakeAnalysisRequest.Create(test_name, False, bug_id)
       request.AddBuildStep(master_name, builder_name, build_number, step_name,
                            time_util.GetUTCNow())
       scheduled = flake_analysis_service.ScheduleAnalysisForFlake(
           request, user_email, is_admin, triggering_sources.FINDIT_UI)
 
       analysis = MasterFlakeAnalysis.GetVersion(
-        master_name, builder_name, build_number, step_name, test_name)
+          master_name, builder_name, build_number, step_name, test_name)
 
       if not analysis:
         if scheduled is None:
           # User does not have permission to trigger, nor was any previous
           # analysis triggered to view.
           return {
               'template': 'error.html',
               'data': {
                   'error_message':
                       ('You could schedule an analysis for flaky test only '
                        'after you login with google.com account.'),
                   'login_url': self.GetLoginUrl(),
               },
               'return_code': 401,
           }
 
         # Check if a previous request has already covered this analysis so use
         # the results from that analysis.
         request = FlakeAnalysisRequest.GetVersion(key=test_name)
 
-        if request and request.analyses:
-          analysis = request.analyses[-1].get()
-        else:
+        if not request:
           return {
               'template': 'error.html',
               'data': {
                   'error_message': (
                       'Flake analysis is not supported for this request. Either'
                       ' the build step may not be supported or the test is not '
                       'swarmed.'),
               },
               'return_code': 400,
           }
 
+        analysis = request.FindMatchingAnalysisForConfiguration(
+            master_name, builder_name)
+
+        if not analysis:  # pragma: no cover
+          logging.error('Flake analysis was deleted unexpectedly!')
+          return {
+              'template': 'error.html',
+              'data': {
+                  'error_message': 'Flake analysis was deleted unexpectedly!',
+              },
+              'return_code': 400
+          }
+
     suspected_flake = _GetSuspectedFlakeAnalysisAndTriageResult(analysis)
 
     data = {
         'master_name': analysis.master_name,
         'builder_name': analysis.builder_name,
         'build_number': analysis.build_number,
         'step_name': analysis.step_name,
         'test_name': analysis.test_name,
         'pass_rates': [],
         'analysis_status': analysis.status_description,
@@ skipping 24 matching lines @@
       coordinates.append([data_point.build_number, data_point.pass_rate])
 
     # Order by build number from earliest to latest.
     coordinates.sort(key=lambda x: x[0])
 
     data['pass_rates'] = coordinates
     return {
         'template': 'flake/result.html',
         'data': data
     }