| 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 1de3e6e0f4bb5718349cc949b43df34a5d96716c..e6f85e82b0b9e1172b90ca7efa9e075bcf25372e 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,18 @@
|
|
|
| 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_configured_test_case
|
| 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_configured_test_case.WaterfallConfiguredTestCase):
|
|
|
| def testNoNewSwarmingTaskIsNeeded(self):
|
| master_name = 'm'
|
| @@ -128,8 +110,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,5 +157,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(
|
| + waterfall_config.GetSwarmingSettings()['iterations_to_rerun'],
|
| + swarming_task.parameters['iterations_to_rerun'])
|
|
|