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

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

Issue 1836293002: [Findit] Adding central config test class for unit tests (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: Fixing code coverage Created 4 years, 9 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
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 72a1c76bf8fbf84ce3f43f372905f6d0ff2ea61a..35b09aec12e6ec04a8c27af5905d01b10a7d6afc 100644
--- a/appengine/findit/waterfall/test/try_job_util_test.py
+++ b/appengine/findit/waterfall/test/try_job_util_test.py
@@ -2,13 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from testing_utils import testing
-
from model import wf_analysis_status
-from model.wf_analysis import WfAnalysis
+from model.test import configured_test_case
from model.wf_try_job import WfTryJob
from waterfall import try_job_util
-from waterfall import waterfall_config
from waterfall.try_job_type import TryJobType
@@ -26,16 +23,11 @@ class _MockRootPipeline(object):
return 'path'
-class TryJobUtilTest(testing.AppengineTestCase):
+class TryJobUtilTest(configured_test_case.ConfiguredTestCase):
def setUp(self):
super(TryJobUtilTest, self).setUp()
- def Mocked_GetTrybotForWaterfallBuilder(*_):
- return 'tryserver.master', 'tryserver.builder'
- self.mock(waterfall_config, 'GetTrybotForWaterfallBuilder',
- Mocked_GetTrybotForWaterfallBuilder)
-
def testNotNeedANewTryJobIfBuildIsNotCompletedYet(self):
self.mock(
try_job_util.swarming_tasks_to_try_job_pipeline,
@@ -49,13 +41,8 @@ class TryJobUtilTest(testing.AppengineTestCase):
self.assertEqual({}, failure_result_map)
def testNotNeedANewTryJobIfBuilderIsNotSupportedYet(self):
- def Mocked_GetTrybotForWaterfallBuilder(*_):
- return None, None
- self.mock(waterfall_config, 'GetTrybotForWaterfallBuilder',
- Mocked_GetTrybotForWaterfallBuilder)
-
- master_name = 'm'
- builder_name = 'b'
+ master_name = 'master2'
+ builder_name = 'builder2'
build_number = 223
failure_info = {
'master_name': master_name,
@@ -401,11 +388,6 @@ class TryJobUtilTest(testing.AppengineTestCase):
try_job_util._GetFailedTargetsFromSignals(signals, 'm', 'b'), ['a.exe'])
def testUseObjectFilesAsFailedTargetIfStrictRegexUsed(self):
- def Mocked_EnableStrictRegexForCompileLinkFailures(*_):
- return True
- self.mock(waterfall_config, 'EnableStrictRegexForCompileLinkFailures',
- Mocked_EnableStrictRegexForCompileLinkFailures)
-
signals = {
'compile': {
'failed_targets': [
@@ -415,4 +397,6 @@ class TryJobUtilTest(testing.AppengineTestCase):
}
self.assertEqual(
- try_job_util._GetFailedTargetsFromSignals(signals, 'm', 'b'), ['b.o'])
+ try_job_util._GetFailedTargetsFromSignals(
+ signals, 'master1', 'builder1'),
+ ['b.o'])

Powered by Google App Engine
This is Rietveld 408576698