[Findit] Use new mock for unittests.

appengine/findit/waterfall/test/try_job_util_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.
 
 from datetime import datetime
 from datetime import timedelta
+import mock
 
 from common.waterfall import failure_type
 from model import analysis_status
 from model.wf_analysis import WfAnalysis
 from model.wf_build import WfBuild
 from model.wf_failure_group import WfFailureGroup
 from model.wf_try_job import WfTryJob
 from waterfall import try_job_util
 from waterfall.test import wf_testcase
 
@@ skipping 44 matching lines @@
             }
         },
         'failure_type': failure_type.COMPILE
     }
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
-  def testBailOutForTestTryJob(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testBailOutForTestTryJob(self, mock_fn):
     master_name = 'master2'
     builder_name = 'builder2'
     build_number = 223
     WfAnalysis.Create(master_name, builder_name, build_number).put()
     failure_info = {
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'failed_steps': {
             'a_test': {}
         },
         'failure_type': failure_type.TEST
     }
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
-  def testBailOutForTryJobWithOutdatedTimestamp(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testBailOutForTryJobWithOutdatedTimestamp(self, mock_fn):
     master_name = 'master1'
     builder_name = 'builder1'
     build_number = 223
     WfAnalysis.Create(master_name, builder_name, build_number).put()
     failure_info = {
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'failed_steps': {
             'compile': {
                 'current_failure': 221,
                 'first_failure': 221,
                 'last_pass': 220
             }
         },
         'failure_type': failure_type.COMPILE
     }
 
     yesterday = datetime.utcnow() - timedelta(days=1)
     build = WfBuild.Create(master_name, builder_name, build_number)
     build.start_time = yesterday
     build.put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return True
-
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = True
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
-  def testNotNeedANewTryJobIfNotFirstTimeFailure(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNotNeedANewTryJobIfNotFirstTimeFailure(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     WfAnalysis.Create(master_name, builder_name, build_number).put()
     failure_info = {
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'failed_steps': {
             'compile': {
@@ skipping 18 matching lines @@
             '223': {
                 'blame_list': ['223-1', '223-2', '223-3'],
                 'chromium_revision': '223-3'
             }
         },
         'failure_type': failure_type.COMPILE
     }
 
     WfAnalysis.Create(master_name, builder_name, build_number).put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
   def testBlameListsIntersect(self):
     self.assertFalse(try_job_util._BlameListsIntersection(['0'], ['1']))
     self.assertFalse(try_job_util._BlameListsIntersection(['1'], []))
     self.assertFalse(try_job_util._BlameListsIntersection([], []))
@@ skipping 603 matching lines @@
 
     WfAnalysis.Create(master_name_2, builder_name, build_number).put()
     # Run pipeline with signals that have different failed steps.
     # Observe new group creation.
     self.assertTrue(try_job_util._IsBuildFailureUniqueAcrossPlatforms(
         master_name_2, builder_name, build_number, failure_type.TEST,
         blame_list, failed_steps_2, None, None))
     self.assertTrue(
         WfFailureGroup.Get(master_name_2, builder_name, build_number))
 
-  def testNotNeedANewTryJobIfOneWithResultExists(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNotNeedANewTryJobIfOneWithResultExists(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'failed_steps': {
             'compile': {
                 'current_failure': 223,
                 'first_failure': 223,
                 'last_pass': 220
             }
@@ skipping 11 matching lines @@
         'failure_type': failure_type.COMPILE
     }
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
     try_job.compile_results = [['rev', 'failed']]
     try_job.status = analysis_status.COMPLETED
     try_job.put()
 
     WfAnalysis.Create(master_name, builder_name, build_number).put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
-  def testNeedANewTryJobIfExistingOneHasError(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNeedANewTryJobIfExistingOneHasError(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'failed_steps': {
             'compile': {
                 'current_failure': 223,
                 'first_failure': 223,
                 'last_pass': 220
             }
@@ skipping 10 matching lines @@
         },
         'failure_type': failure_type.COMPILE
     }
 
     try_job = WfTryJob.Create(master_name, builder_name, build_number)
     try_job.status = analysis_status.ERROR
     try_job.put()
 
     WfAnalysis.Create(master_name, builder_name, build_number).put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertTrue(need_try_job)
 
-  def testNotNeedANewTryJobIfNoNewFailure(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNotNeedANewTryJobIfNoNewFailure(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'failed_steps': {
             'a': {
                 'current_failure': 223,
                 'first_failure': 222,
                 'last_pass': 221,
                 'tests': {
                     'a.t2': {
                         'current_failure': 223,
                         'first_failure': 222,
                         'last_pass': 221
                     }
                 }
             }
         },
         'failure_type': failure_type.TEST
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
     analysis.failure_result_map = {
         'a': {
             'a.t2': 'm/b/222'
         }
     }
     analysis.put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
-  def testNeedANewTryJobIfTestFailureSwarming(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNeedANewTryJobIfTestFailureSwarming(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'failed_steps': {
             'a': {
                 'current_failure': 223,
                 'first_failure': 222,
                 'last_pass': 221,
                 'tests': {
@@ skipping 53 matching lines @@
             'a.t2': 'm/b/222',
             'a.t3': 'm/b/223'
         },
         'b': {
             'b.t1': 'm/b/222',
             'b.t2': 'm/b/222'
         }
     }
     analysis.put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertTrue(need_try_job)
 
-  def testNeedANewTryJob(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNeedANewTryJob(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'failed_steps': {
             'compile': {
                 'current_failure': 223,
@@ skipping 13 matching lines @@
         },
         'failure_type': failure_type.COMPILE
     }
 
     analysis = WfAnalysis.Create(master_name, builder_name, build_number)
     analysis.failure_result_map = {
         'compile': 'm/b/223'
     }
     analysis.put()
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertTrue(need_try_job)
 
-  def testNotNeedANewTryJobForOtherType(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNotNeedANewTryJobForOtherType(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'failed_steps': {},
         'builds': {
             '222': {
                 'blame_list': ['222-1'],
                 'chromium_revision': '222-1'
             },
             '223': {
                 'blame_list': ['223-1', '223-2', '223-3'],
                 'chromium_revision': '223-3'
             }
         },
         'failure_type': failure_type.UNKNOWN
     }
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
-  def testNotNeedANewTryJobForCompileTypeNoFailureInfo(self):
+  @mock.patch.object(try_job_util, '_ShouldBailOutForOutdatedBuild')
+  def testNotNeedANewTryJobForCompileTypeNoFailureInfo(self, mock_fn):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
     failure_info = {
         'master_name': master_name,
         'builder_name': builder_name,
         'build_number': build_number,
         'failed_steps': {},
         'builds': {
             '222': {
                 'blame_list': ['222-1'],
                 'chromium_revision': '222-1'
             },
             '223': {
                 'blame_list': ['223-1', '223-2', '223-3'],
                 'chromium_revision': '223-3'
             }
         },
         'failure_type': failure_type.COMPILE
     }
 
-    def _MockShouldBailOutForOutdatedBuild(*_):
-      return False
-    self.mock(
-        try_job_util, '_ShouldBailOutForOutdatedBuild',
-        _MockShouldBailOutForOutdatedBuild)
+    mock_fn.return_value = False
 
     need_try_job = try_job_util.NeedANewTryJob(
         master_name, builder_name, build_number, failure_info, None, None)
 
     self.assertFalse(need_try_job)
 
   def testForceTryJob(self):
     master_name = 'm'
     builder_name = 'b'
     build_number = 223
@@ skipping 158 matching lines @@
             'failed_targets': [
                 {'source': 'b.cc', 'target': 'b.o'},
             ]
         }
     }
 
     self.assertEqual(
         try_job_util.GetFailedTargetsFromSignals(
             signals, 'master1', 'builder1'),
         ['b.o'])