[Findit] Post analysis results of flakes to bug filed by chromium-try-flakes.

appengine/findit/waterfall/flake/test/flake_analysis_service_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.
 
 from datetime import datetime
 import mock
 
 from common import constants
 from model.flake.flake_analysis_request import BuildStep
 from model.flake.flake_analysis_request import FlakeAnalysisRequest
 from waterfall.flake import flake_analysis_service
 from waterfall.flake import triggering_sources
 from waterfall.test import wf_testcase
+from waterfall.test_info import TestInfo
 
 
 class FlakeAnalysisServiceTest(wf_testcase.WaterfallTestCase):
 
   def testCheckFlakeSwarmedAndSupportedWhenNotSupported(self):
     request = FlakeAnalysisRequest.Create('flake', False, 123)
     step1 = BuildStep.Create('m', 'b1', 10, 's', datetime(2016, 10, 01))
     step1.swarmed = False
     step1.supported = False
     step2 = BuildStep.Create('m', 'b2', 10, 's', datetime(2016, 10, 01))
@@ skipping 195 matching lines @@
     def CheckForNewAnalysis(*_):
       step.wf_master_name = 'wf_m'
       step.wf_builder_name = 'wf_b'
       step.wf_build_number = 100
       step.wf_step_name = 'wf_s'
       return 1, step
 
     mocked_analysis = mock.Mock(key='key')
     mocked_request = mock.Mock()
 
+    normalized_test = TestInfo('wf_m', 'wf_b', 100, 'wf_s', 'flake')
+    original_test = TestInfo('m', 'b', 80, 's', 'flake')
+
     with mock.patch.object(
         flake_analysis_service, '_CheckForNewAnalysis',
         side_effect=CheckForNewAnalysis) as (
             mocked_CheckForNewAnalysis), mock.patch.object(
                 flake_analysis_service.initialize_flake_pipeline,
                 'ScheduleAnalysisIfNeeded', return_value=mocked_analysis) as (
                     mocked_ScheduleAnalysisIfNeeded), mock.patch.object(
                         flake_analysis_service.FlakeAnalysisRequest,
                         'GetVersion', return_value=mocked_request) as (
                             mocked_GetVersion):
       self.assertTrue(flake_analysis_service.ScheduleAnalysisForFlake(
           request, user_email, True, triggering_source))
       mocked_CheckForNewAnalysis.assert_called_once_with(request)
       mocked_ScheduleAnalysisIfNeeded.assert_called_once_with(
-          'wf_m', 'wf_b', 100, 'wf_s', 'flake',
+          normalized_test, original_test, bug_id=123,
           allow_new_analysis=True, manually_triggered=False,
           user_email=user_email, triggering_source=triggering_source,
           queue_name=constants.WATERFALL_ANALYSIS_QUEUE)
       mocked_GetVersion.assert_called_once_with(key='flake', version=1)
       mocked_request.assert_has_calls([
           mock.call.analyses.append('key'),
           mock.call.put(),
       ])
 
   @mock.patch.object(
       flake_analysis_service.step_mapper, 'FindMatchingWaterfallStep')
   def testAuthorizedAccessAndNewAnalysisNeededButNotTriggered(self, _mock):
     step = BuildStep.Create('m', 'b', 80, 's', datetime(2016, 10, 20))
     request = FlakeAnalysisRequest.Create('flake', False, 123)
     request.build_steps = [step]
     user_email = 'test@chromium.org'
     triggering_source = triggering_sources.FINDIT_UI
 
     def CheckForNewAnalysis(*_):
       step.wf_master_name = 'wf_m'
       step.wf_builder_name = 'wf_b'
       step.wf_build_number = 100
       step.wf_step_name = 'wf_s'
       return 1, step
 
+    normalized_test = TestInfo('wf_m', 'wf_b', 100, 'wf_s', 'flake')
+    original_test = TestInfo('m', 'b', 80, 's', 'flake')
     with mock.patch.object(
         flake_analysis_service, '_CheckForNewAnalysis',
         side_effect=CheckForNewAnalysis) as (
             mocked_CheckForNewAnalysis), mock.patch.object(
                 flake_analysis_service.initialize_flake_pipeline,
                 'ScheduleAnalysisIfNeeded', return_value=None) as (
                     mocked_ScheduleAnalysisIfNeeded), mock.patch.object(
                         flake_analysis_service.FlakeAnalysisRequest,
                         'GetVersion', return_value=None) as mocked_GetVersion:
       self.assertFalse(flake_analysis_service.ScheduleAnalysisForFlake(
           request, user_email, True, triggering_sources.FINDIT_UI))
       mocked_CheckForNewAnalysis.assert_called_once_with(request)
       mocked_ScheduleAnalysisIfNeeded.assert_called_once_with(
-          'wf_m', 'wf_b', 100, 'wf_s', 'flake',
+          normalized_test, original_test, bug_id=123,
           allow_new_analysis=True, manually_triggered=False,
           user_email=user_email, triggering_source=triggering_source,
           queue_name=constants.WATERFALL_ANALYSIS_QUEUE)
       mocked_GetVersion.assert_not_called()