[Findit] Fixing analysis mismatch in check flake

appengine/findit/handlers/flake/test/check_flake_test.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 datetime
 import mock
 import re
 
 import webapp2
 import webtest
 
 from google.appengine.api import users
 
 from handlers.flake import check_flake
 from handlers.flake.check_flake import CheckFlake
 from model import analysis_status
 from model.analysis_status import STATUS_TO_DESCRIPTION
+from model.flake.flake_analysis_request import BuildStep
 from model.flake.flake_analysis_request import FlakeAnalysisRequest
 from model.flake.master_flake_analysis import DataPoint
 from model.flake.master_flake_analysis import MasterFlakeAnalysis
 from waterfall.flake import flake_analysis_service
 from waterfall.test import wf_testcase
 
 
 class CheckFlakeTest(wf_testcase.WaterfallTestCase):
   app_module = webapp2.WSGIApplication([
       ('/waterfall/check-flake', check_flake.CheckFlake),
@@ skipping 131 matching lines @@
     previous_analysis.data_points.append(data_point)
     previous_analysis.status = analysis_status.COMPLETED
     previous_analysis.suspected_flake_build_number = 100
     previous_analysis.request_time = datetime.datetime(2016, 10, 01, 12, 10, 00)
     previous_analysis.start_time = datetime.datetime(2016, 10, 01, 12, 10, 05)
     previous_analysis.end_time = datetime.datetime(2016, 10, 01, 13, 10, 00)
     previous_analysis.algorithm_parameters = {'iterations_to_rerun': 100}
     previous_analysis.Save()
 
     previous_request = FlakeAnalysisRequest.Create(test_name, False, None)
-    previous_request.AddBuildStep(
+    build_step = BuildStep.Create(
         master_name, builder_name, build_number, step_name, None)
+    build_step.wf_master_name = build_step.master_name
+    build_step.wf_builder_name = build_step.builder_name
+    build_step.wf_build_number = build_step.build_number
+    build_step.wf_step_name = build_step.step_name
+    previous_request.build_steps.append(build_step)
     previous_request.analyses.append(previous_analysis.key)
     previous_request.Save()
 
     response = self.test_app.get('/waterfall/check-flake', params={
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'step_name': step_name,
         'test_name': test_name,
         'format': 'json'})
@@ skipping 30 matching lines @@
     builder_name = 'b'
     build_number = 123
     step_name = 's'
     test_name = 't'
 
     previous_request = FlakeAnalysisRequest.Create(test_name, False, None)
     previous_request.AddBuildStep(
         master_name, builder_name, build_number, step_name, None)
     previous_request.swarmed = False
     previous_request.supported = False
-    previous_request.Save()
 
     self.assertRaisesRegexp(
         webtest.app.AppError,
         re.compile('.*not supported.*', re.MULTILINE | re.DOTALL),
         self.test_app.get,
         '/waterfall/check-flake',
         params={
             'master_name': master_name,
             'builder_name': builder_name,
             'build_number': build_number,
@@ skipping 64 matching lines @@
             'm', 'b', '1', None, 't', '').get('data', {}).get('error_message'),
         'Step name must be specified')
     self.assertEqual(
         CheckFlake()._ValidateInput(
             'm', 'b', '1', 's', None, '').get('data', {}).get('error_message'),
         'Test name must be specified')
     self.assertEqual(
         CheckFlake()._ValidateInput(
             'm', 'b', '1', 's', 't', 'a').get('data', {}).get('error_message'),
         'Bug id (optional) must be an int')