[Findit] Use new mock for unittests.

appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py

 # Copyright 2015 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 mock
 
 from common.waterfall import buildbucket_client
 from common.waterfall import failure_type
 from model.wf_try_job import WfTryJob
 from model.wf_try_job_data import WfTryJobData
@@ skipping 40 matching lines @@
                                  '/%s/builds/%s') % (
                                      master_name, builder_name, build_number)
     }
     try_job_pipeline = ScheduleTryJobPipeline()
     properties = try_job_pipeline._GetBuildProperties(
         master_name, builder_name, build_number, 1, 2, failure_type.TEST, None)
 
     self.assertEqual(properties, expected_properties)
 
   @mock.patch.object(schedule_try_job_pipeline, 'buildbucket_client')
-  def testTriggerTryJob(self, mock_other):
+  def testTriggerTryJob(self, mock_module):
     master_name = 'm'
     builder_name = 'b'
     response = {
         'build': {
             'id': '1',
             'url': 'url',
             'status': 'SCHEDULED',
         }
     }
     results = [(None, buildbucket_client.BuildbucketBuild(response['build']))]
-    mock_other.TriggerTryJobs.return_value = results
+    mock_module.TriggerTryJobs.return_value = results
 
     try_job_pipeline = ScheduleTryJobPipeline()
     build_id = try_job_pipeline._TriggerTryJob(
         master_name, builder_name, {}, [])
 
     self.assertEqual(build_id, '1')
 
 
   def testCreateTryJobData(self):
     build_id = 1
     master_name = 'm'
     builder_name = 'b'
     build_number = 1
     try_job_type = failure_type.GetDescriptionForFailureType(failure_type.TEST)
 
     ScheduleTryJobPipeline()._CreateTryJobData(
         build_id, master_name, builder_name, build_number, try_job_type,
         False, False)
 
     data = WfTryJobData.Get(build_id)
 
     self.assertIsNotNone(data)
     self.assertEqual(data.master_name, master_name)
     self.assertEqual(data.builder_name, builder_name)
     self.assertEqual(data.build_number, build_number)
     self.assertEqual(data.try_job_type, try_job_type)
     self.assertFalse(data.has_compile_targets)
     self.assertFalse(data.has_heuristic_results)