[Findit] Flake checker: Get full build info for each flake build analyzed

appengine/findit/waterfall/test/process_base_swarming_task_result_pipeline_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
 
 from model import analysis_status
 from model.flake.flake_swarming_task import FlakeSwarmingTask
 from model.flake.master_flake_analysis import MasterFlakeAnalysis
 from model.wf_swarming_task import WfSwarmingTask
+from waterfall import build_util
 from waterfall import swarming_util
-from waterfall import process_flake_swarming_task_result_pipeline
+from waterfall.build_info import BuildInfo
 from waterfall.process_base_swarming_task_result_pipeline import (
     ProcessBaseSwarmingTaskResultPipeline)
 from waterfall.process_flake_swarming_task_result_pipeline import (
     ProcessFlakeSwarmingTaskResultPipeline)
 from waterfall.process_swarming_task_result_pipeline import (
     ProcessSwarmingTaskResultPipeline)
 from waterfall.test import wf_testcase
 
 
 _ISOLATED_SERVER = 'https://isolateserver.appspot.com'
@@ skipping 160 matching lines @@
         {},
         ProcessBaseSwarmingTaskResultPipeline._CheckTestsRunStatuses(
             self.pipeline, None, ()))
 
   def testCheckTestsRunStatuses(self):
     tests_statuses = (
         ProcessSwarmingTaskResultPipeline()._CheckTestsRunStatuses(
             _SAMPLE_FAILURE_LOG))
     self.assertEqual(_EXPECTED_TESTS_STATUS, tests_statuses)
 
-  @mock.patch.object(process_flake_swarming_task_result_pipeline,
-                     '_GetCommitPositionAndGitHash',
-                     return_value=(12345, 'git_hash'))
-  def testMonitorSwarmingTaskTimeOut(self, _):
+  @mock.patch.object(build_util, 'GetBuildInfo')
+  def testMonitorSwarmingTaskTimeOut(self, mocked_fn):
+    build_info = BuildInfo(
+        self.master_name, self.builder_name, self.build_number)
+    build_info.commit_position = 12345
+    build_info.chromium_revision = 'a1b2c3d4'
+    mocked_fn.return_value = build_info
+
     # Override swarming config settings to force a timeout.
     override_swarming_settings = {
         'task_timeout_hours': -1
     }
     self.UpdateUnitTestConfigSettings(
         'swarming_settings', override_swarming_settings)
 
     task = FlakeSwarmingTask.Create(
         self.master_name, self.builder_name, self.build_number, self.step_name,
         self.test_name)
@@ skipping 174 matching lines @@
     self.assertEqual(analysis_status.COMPLETED, task.status)
     self.assertEqual(_EXPECTED_TESTS_STATUS, task.tests_statuses)
     self.assertEqual(
         _EXPECTED_CLASSIFIED_TESTS, task.classified_tests)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 32, 6, 538220),
                      task.created_time)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 32, 9, 90550),
                      task.started_time)
     self.assertEqual(datetime.datetime(2016, 2, 10, 18, 33, 9),
                      task.completed_time)