Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2934)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: appengine/findit/waterfall/test/try_job_util_test.py

Issue 2203643002: [Findit] Use new mock for unittests. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@0708-pipeline-refactor
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py ('K') | « appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/findit/waterfall/test/try_job_util_test.py
diff --git a/appengine/findit/waterfall/test/try_job_util_test.py b/appengine/findit/waterfall/test/try_job_util_test.py
index b83558694a4f0d4909d43f88501fdc82bfb9bf81..f58c1ffcb3fc5c58f9918e3a045d099dc3cb5b2c 100644
--- a/appengine/findit/waterfall/test/try_job_util_test.py
+++ b/appengine/findit/waterfall/test/try_job_util_test.py
@@ -4,6 +4,7 @@
from datetime import datetime
from datetime import timedelta
+import mock
from common.waterfall import failure_type
from model import analysis_status
@@ -68,7 +69,8 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
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
@@ -83,18 +85,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
'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
@@ -118,19 +117,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
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
@@ -169,11 +164,7 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
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)
@@ -797,7 +788,8 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
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
@@ -829,18 +821,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
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
@@ -871,18 +860,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
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
@@ -912,18 +898,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
}
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
@@ -997,18 +980,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
}
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
@@ -1042,18 +1022,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
}
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
@@ -1075,18 +1052,15 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
'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
@@ -1108,11 +1082,7 @@ class TryJobUtilTest(wf_testcase.WaterfallTestCase):
'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)
« appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py ('K') | « appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698