[Findit] Use new mock for unittests.

appengine/findit/waterfall/test/detect_first_failure_pipeline_test.py

 # Copyright 2014 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 json
+import mock
 import os
 import urllib
 import zlib
 
 from common.http_client_appengine import HttpClientAppengine as HttpClient
 from common.pipeline_wrapper import pipeline_handlers
 from common.waterfall import failure_type
 from model import analysis_status
 from model.wf_analysis import WfAnalysis
 from model.wf_build import WfBuild
@@ skipping 300 matching lines @@
             'Unittest3.Subtest2': {
                 'current_failure': 223,
                 'first_failure': 223,
                 'base_test_name': 'Unittest3.Subtest2'
             }
         }
     }
 
     self.assertEqual(expected_failed_step, failed_step)
 
-  def testCheckFirstKnownFailureForSwarmingTestsFoundFlaky(self):
+  @mock.patch.object(detect_first_failure_pipeline, 'swarming_util')
+  def testCheckFirstKnownFailureForSwarmingTestsFoundFlaky(self, mock_module):
     master_name = 'm'
     builder_name = 'b'
     build_number = 221
     step_name = 'abc_test'
     failed_steps = {
         'abc_test': {
             'current_failure': 221,
             'first_failure': 221,
             'list_isolated_data': [
                 {
@@ skipping 16 matching lines @@
         '223': {
             'blame_list': ['commit3', 'commit4'],
             'chromium_revision': 'commit4'
         }
     }
     expected_failed_steps = failed_steps
     step = WfStep.Create(master_name, builder_name, build_number, step_name)
     step.isolated = True
     step.put()
 
-    def MockGetIsolatedDataForFailedBuild(*_):
-      return True
-    self.mock(
-        swarming_util, 'GetIsolatedDataForFailedBuild',
-        MockGetIsolatedDataForFailedBuild)
-
-    def MockRetrieveShardedTestResultsFromIsolatedServer(*_):
-      return json.loads(
-          self._GetSwarmingData(
-              'isolated-plain', 'm_b_223_abc_test_flaky.json'))
-    self.mock(
-        swarming_util, 'RetrieveShardedTestResultsFromIsolatedServer',
-        MockRetrieveShardedTestResultsFromIsolatedServer)
+    mock_module.GetIsolatedDataForFailedBuild.return_value = True
+    mock_module.RetrieveShardedTestResultsFromIsolatedServer.return_value = (
+      json.loads(self._GetSwarmingData(
+          'isolated-plain', 'm_b_223_abc_test_flaky.json')))
 
     pipeline = DetectFirstFailurePipeline()
     pipeline._CheckFirstKnownFailureForSwarmingTests(
         master_name, builder_name, build_number, failed_steps, builds)
 
     self.assertEqual(expected_failed_steps, failed_steps)
 
   def testUpdateFirstFailureOnTestLevelThenUpdateStepLevel(self):
     master_name = 'm'
     builder_name = 'b'
@@ skipping 356 matching lines @@
         'PRE_t': 'PRE_t',
         'TestSuite1.Test1': 'TestSuite1.Test1',
         'TestSuite1.PRE_Test1': 'TestSuite1.Test1',
         'TestSuite1.PRE_PRE_Test1': 'TestSuite1.Test1',
         'PRE_TestSuite1.Test1': 'PRE_TestSuite1.Test1'
     }
 
     for test, expected_base_test in test_smaples.iteritems():
       base_test = detect_first_failure_pipeline._RemoveAllPrefixes(test)
       self.assertEqual(base_test, expected_base_test)