[Findit] Use new mock for unittests.

appengine/findit/handlers/test/monitor_alerts_test.py

Index: appengine/findit/handlers/test/monitor_alerts_test.py
diff --git a/appengine/findit/handlers/test/monitor_alerts_test.py b/appengine/findit/handlers/test/monitor_alerts_test.py
index 830d679565df8add8b7d4d0202f7535dfdeabbe7..e982a9d876eeb49d461fbd39a66f5b95f02a0144 100644
--- a/appengine/findit/handlers/test/monitor_alerts_test.py
+++ b/appengine/findit/handlers/test/monitor_alerts_test.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import mock
 import textwrap
 
 import webapp2
@@ -145,7 +146,9 @@ class MonitorAlertsTest(wf_testcase.WaterfallTestCase):
     build_failures = monitor_alerts._GetLatestBuildFailures(http_client)
     self.assertEqual(expected_build_failures, build_failures)
 
-  def testAnalysisScheduled(self):
+  @mock.patch.object(monitor_alerts, '_GetLatestBuildFailures')
+  @mock.patch.object(monitor_alerts, 'build_failure_analysis_pipelines')
+  def testAnalysisScheduled(self, mock_other, mock_fn):

[Sharu Jiang, 2016/08/02 22:27:16]

The mock_other seems a little confusing to me... what does 'other' mean?
How about mock_pipeline or mock_module?

[chanli, 2016/08/02 23:10:32]

Done.

     build_failures = [
         {
             'master_name': 'm3',
@@ -155,28 +158,12 @@ class MonitorAlertsTest(wf_testcase.WaterfallTestCase):
         },
     ]
 
-    def MockGetLatestBuildFailures(*_):
-      return build_failures
-    self.mock(
-        monitor_alerts, '_GetLatestBuildFailures', MockGetLatestBuildFailures)
-
-    expected_scheduled_analyses = [
-        ('m3', 'b3', 3, ['s3'], False,
-         constants.WATERFALL_ANALYSIS_QUEUE),
-    ]
-
-    scheduled_analyses = []
-    def MockScheduleAnalysisIfNeeded(master_name, builder_name, build_number,
-                                     failed_steps, force, queue_name):
-      scheduled_analyses.append(
-          (master_name, builder_name, build_number,
-           failed_steps, force, queue_name))
-
-    self.mock(build_failure_analysis_pipelines, 'ScheduleAnalysisIfNeeded',
-              MockScheduleAnalysisIfNeeded)
+    mock_fn.return_value = build_failures
 
     self.mock_current_user(user_email='test@chromium.org', is_admin=True)
     response = self.test_app.get('/monitor-alerts')
     self.assertEqual(200, response.status_int)
 
-    self.assertEqual(expected_scheduled_analyses, scheduled_analyses)
+    mock_other.ScheduleAnalysisIfNeeded.assert_called_with(
+        'm3', 'b3', 3, failed_steps=['s3'], force=False,
+        queue_name=constants.WATERFALL_ANALYSIS_QUEUE)