Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1425)

Unified Diff: appengine/findit/waterfall/test/trigger_swarming_task_pipeline_test.py

Issue 1836293002: [Findit] Adding central config test class for unit tests (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: Fixing code coverage Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..a608ffb4eb31329ca872ba7e2a83d4042ee6c841 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.test import configured_test_case
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.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(configured_test_case.ConfiguredTestCase):
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,5 +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(
+ waterfall_config.GetSwarmingSettings()['iterations_to_rerun'],
+ swarming_task.parameters['iterations_to_rerun'])

Powered by Google App Engine
This is Rietveld 408576698