Index: appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.py |
diff --git a/appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.py b/appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.py |
index b9d362f7168658e4d7d7499a7982656ba69c7aae..0ec24b0b9b29292f6cb4b3d5d0820fba6c5ef5f9 100644 |
--- a/appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.py |
+++ b/appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.py |
@@ -4,36 +4,17 @@ |
import time |
-from testing_utils import testing |
- |
from model import wf_analysis_status |
from model.wf_swarming_task import WfSwarmingTask |
from waterfall import swarming_util |
+from waterfall import trigger_swarming_task_pipeline |
from waterfall import waterfall_config |
from waterfall.swarming_task_request import SwarmingTaskRequest |
-from waterfall import trigger_swarming_task_pipeline |
+from waterfall.test import wf_testcase |
from waterfall.trigger_swarming_task_pipeline import TriggerSwarmingTaskPipeline |
-_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 TriggerSwarmingTaskPipelineTest(testing.AppengineTestCase): |
- |
- def _MockGetSwarmingSettings(self): |
- def MockedGetSwarmingSettings(): |
- return _MOCK_SWARMING_SETTINGS |
- self.mock(waterfall_config, 'GetSwarmingSettings', |
- MockedGetSwarmingSettings) |
+class TriggerSwarmingTaskPipelineTest(wf_testcase.WaterfallTestCase): |
def testNoNewSwarmingTaskIsNeeded(self): |
master_name = 'm' |
@@ -128,8 +109,6 @@ class TriggerSwarmingTaskPipelineTest(testing.AppengineTestCase): |
self.mock(trigger_swarming_task_pipeline, '_GetSwarmingTaskName', |
MockedGetSwarmingTaskName) |
- self._MockGetSwarmingSettings() |
- |
master_name = 'm' |
builder_name = 'b' |
build_number = 234 |
@@ -177,6 +156,6 @@ class TriggerSwarmingTaskPipelineTest(testing.AppengineTestCase): |
self.assertIsNotNone(swarming_task) |
self.assertEqual('new_task_id', swarming_task.task_id) |
self.assertEqual(tests, swarming_task.parameters['tests']) |
- self.assertEqual(_MOCK_SWARMING_SETTINGS['iterations_to_rerun'], |
- swarming_task.parameters['iterations_to_rerun']) |
- self.assertEqual('a_tests', swarming_task.parameters['ref_name']) |
+ self.assertEqual( |
+ waterfall_config.GetSwarmingSettings()['iterations_to_rerun'], |
+ swarming_task.parameters['iterations_to_rerun']) |