Index: appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py |
diff --git a/appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py b/appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py |
index e446360e1a71bf18a75c9dfed0fbbb1063a73ee0..ed08ad6ce70f9adb013c8f7b01d0391dd3a1883e 100644 |
--- a/appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py |
+++ b/appengine/findit/waterfall/test/monitor_try_job_pipeline_test.py |
@@ -4,15 +4,14 @@ |
from datetime import datetime |
import json |
-from testing_utils import testing |
import time |
from common import buildbucket_client |
from model import wf_analysis_status |
from model.wf_try_job import WfTryJob |
from model.wf_try_job_data import WfTryJobData |
-from waterfall import waterfall_config |
from waterfall.monitor_try_job_pipeline import MonitorTryJobPipeline |
+from waterfall.test import wf_testcase |
from waterfall.try_job_type import TryJobType |
@@ -24,7 +23,7 @@ REQUEST_COUNTER = { |
} |
-class MonitorTryJobPipelineTest(testing.AppengineTestCase): |
+class MonitorTryJobPipelineTest(wf_testcase.WaterfallTestCase): |
def _MockGetTryJobs(self, build_id): |
def Mocked_GetTryJobs(*_): |
@@ -121,17 +120,8 @@ class MonitorTryJobPipelineTest(testing.AppengineTestCase): |
self.mock(buildbucket_client, 'GetTryJobs', Mocked_GetTryJobs) |
- def _MockGetTryJobSettings(self): |
- return { |
- 'server_query_interval_seconds': 60, |
- 'job_timeout_hours': 5, |
- 'allowed_response_error_times': 5 |
- } |
- |
def setUp(self): |
super(MonitorTryJobPipelineTest, self).setUp() |
- self.mock( |
- waterfall_config, 'GetTryJobSettings', self._MockGetTryJobSettings) |
self.mock(time, 'sleep', lambda x: None) |
def testMicrosecondsToDatetime(self): |
@@ -215,7 +205,6 @@ class MonitorTryJobPipelineTest(testing.AppengineTestCase): |
try_job.status = wf_analysis_status.ANALYZING |
try_job.put() |
self._MockGetTryJobs(try_job_id) |
- self._MockGetTryJobSettings() |
pipeline = MonitorTryJobPipeline() |
compile_result = pipeline.run( |
@@ -262,7 +251,6 @@ class MonitorTryJobPipelineTest(testing.AppengineTestCase): |
try_job.status = wf_analysis_status.ANALYZING |
try_job.put() |
self._MockGetTryJobs(try_job_id) |
- self._MockGetTryJobSettings() |
pipeline = MonitorTryJobPipeline() |
test_result = pipeline.run( |