Index: appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
diff --git a/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py b/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
index 34b633e69495d54c974cb6dfb87d8f68c7ef012f..30c8a92572ab76637564c9839db0e2bd1a59968f 100644 |
--- a/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
+++ b/appengine/findit/waterfall/test/schedule_try_job_pipeline_test.py |
@@ -2,22 +2,17 @@ |
# 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 common import buildbucket_client |
+from model.test import configured_test_case |
from model.wf_try_job import WfTryJob |
-from waterfall import waterfall_config |
from waterfall.schedule_try_job_pipeline import ScheduleTryJobPipeline |
from waterfall.try_job_type import TryJobType |
-class ScheduleTryjobPipelineTest(testing.AppengineTestCase): |
+class ScheduleTryjobPipelineTest(configured_test_case.ConfiguredTestCase): |
- def _Mock_GetTrybotForWaterfallBuilder(self, *_): |
- def MockedGetTrybotForWaterfallBuilder(*_): |
- return 'linux_chromium_variable', 'master.tryserver.chromium.linux' |
- self.mock(waterfall_config, 'GetTrybotForWaterfallBuilder', |
- MockedGetTrybotForWaterfallBuilder) |
+ def setUp(self): |
stgao
2016/03/30 01:06:30
This could be removed now.
lijeffrey
2016/03/30 23:28:34
Done.
|
+ super(ScheduleTryjobPipelineTest, self).setUp() |
def _Mock_TriggerTryJobs(self, responses): |
def MockedTriggerTryJobs(*_): |
@@ -96,7 +91,7 @@ class ScheduleTryjobPipelineTest(testing.AppengineTestCase): |
} |
} |
] |
- self._Mock_GetTrybotForWaterfallBuilder(master_name, builder_name) |
+ |
self._Mock_TriggerTryJobs(responses) |
WfTryJob.Create(master_name, builder_name, build_number).put() |
@@ -130,7 +125,6 @@ class ScheduleTryjobPipelineTest(testing.AppengineTestCase): |
} |
} |
] |
- self._Mock_GetTrybotForWaterfallBuilder(master_name, builder_name) |
self._Mock_TriggerTryJobs(responses) |
WfTryJob.Create(master_name, builder_name, build_number).put() |