Index: appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py |
diff --git a/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py b/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py |
index 2beade7ddb9718ba4e66340d0c335b367ba0e015..a55f18c3d2421251a9479f2c413a4b9719d86f70 100644 |
--- a/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py |
+++ b/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py |
@@ -4,13 +4,11 @@ |
import datetime |
-from testing_utils import testing |
- |
from model import wf_analysis_status |
+from model.test import configured_test_case |
from model.wf_swarming_task import WfSwarmingTask |
from waterfall import process_swarming_task_result_pipeline |
from waterfall import swarming_util |
-from waterfall import waterfall_config |
from waterfall.process_swarming_task_result_pipeline import ( |
ProcessSwarmingTaskResultPipeline) |
@@ -106,19 +104,8 @@ _EXPECTED_CLASSIFIED_TESTS = { |
} |
-_MOCK_SWARMING_SETTINGS = { |
- 'task_timeout_hours': 23, |
- 'server_query_interval_seconds': 60, |
- 'iterations_to_rerun': 10, |
- 'server_host': 'chromium-swarm.appspot.com', |
- 'default_request_priority': 150, |
- 'isolated_storage_url': 'isolateserver.storage.googleapis.com', |
- 'isolated_server': 'https://isolateserver.appspot.com', |
- 'request_expiration_hours': 20 |
-} |
- |
- |
-class ProcessSwarmingTaskResultPipelineTest(testing.AppengineTestCase): |
+class ProcessSwarmingTaskResultPipelineTest( |
+ configured_test_case.ConfiguredTestCase): |
def _MockedGetSwarmingTaskResultById(self, task_id, _): |
swarming_task_results = { |
@@ -152,9 +139,6 @@ class ProcessSwarmingTaskResultPipelineTest(testing.AppengineTestCase): |
self.builder_name = 'b' |
self.build_number = 121 |
self.step_name = 'abc_tests on platform' |
- def _MockGetSwarmingSettings(): |
- return _MOCK_SWARMING_SETTINGS |
- self.mock(waterfall_config, 'GetSwarmingSettings', _MockGetSwarmingSettings) |
self.mock(swarming_util, 'GetSwarmingTaskResultById', |
self._MockedGetSwarmingTaskResultById) |
@@ -204,7 +188,6 @@ class ProcessSwarmingTaskResultPipelineTest(testing.AppengineTestCase): |
self.assertEqual(datetime.datetime(2016, 2, 10, 18, 33, 9), |
task.completed_time) |
- |
def testProcessSwarmingTaskResultPipelineTaskNotRunning(self): |
task_id = 'task_id2' |
@@ -230,8 +213,9 @@ class ProcessSwarmingTaskResultPipelineTest(testing.AppengineTestCase): |
def testProcessSwarmingTaskResultPipelineTaskTimeOut(self): |
task_id = 'task_id1' |
- old_mock_timeout = _MOCK_SWARMING_SETTINGS['task_timeout_hours'] |
- _MOCK_SWARMING_SETTINGS['task_timeout_hours'] = -1 |
+ config_settings = configured_test_case.DEFAULT_UNIT_TEST_CONFIG_DATA |
+ config_settings['swarming_settings']['task_timeout_hours'] = -1 |
+ configured_test_case.MockConfigSettings(config_settings) |
WfSwarmingTask.Create( |
self.master_name, self.builder_name, |
@@ -252,5 +236,4 @@ class ProcessSwarmingTaskResultPipelineTest(testing.AppengineTestCase): |
self.assertEqual(wf_analysis_status.ERROR, task.status) |
self.assertEqual({}, task.tests_statuses) |
self.assertEqual({}, task.classified_tests) |
- |
- _MOCK_SWARMING_SETTINGS['task_timeout_hours'] = old_mock_timeout |
+ configured_test_case.MockConfigSettings() |