| Index: appengine/findit/waterfall/test/detect_first_failure_pipeline_test.py
|
| diff --git a/appengine/findit/waterfall/test/detect_first_failure_pipeline_test.py b/appengine/findit/waterfall/test/detect_first_failure_pipeline_test.py
|
| index 138ba0fdd25307b8e69bbdf42348869551aeab80..2b8f403b0bbffb57083badcadea96b713940f5be 100644
|
| --- a/appengine/findit/waterfall/test/detect_first_failure_pipeline_test.py
|
| +++ b/appengine/findit/waterfall/test/detect_first_failure_pipeline_test.py
|
| @@ -8,10 +8,9 @@ import os
|
| import urllib
|
| import zlib
|
|
|
| -from testing_utils import testing
|
| -
|
| from common.http_client_appengine import HttpClientAppengine as HttpClient
|
| from model import wf_analysis_status
|
| +from model.test import configured_test_case
|
| from model.wf_analysis import WfAnalysis
|
| from model.wf_build import WfBuild
|
| from model.wf_step import WfStep
|
| @@ -19,23 +18,10 @@ from pipeline_wrapper import pipeline_handlers
|
| from waterfall import buildbot
|
| from waterfall import lock_util
|
| from waterfall import swarming_util
|
| -from waterfall import waterfall_config
|
| from waterfall.detect_first_failure_pipeline import DetectFirstFailurePipeline
|
|
|
|
|
| -_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 DetectFirstFailureTest(testing.AppengineTestCase):
|
| +class DetectFirstFailureTest(configured_test_case.ConfiguredTestCase):
|
| app_module = pipeline_handlers._APP
|
|
|
| def setUp(self):
|
| @@ -49,10 +35,6 @@ class DetectFirstFailureTest(testing.AppengineTestCase):
|
|
|
| self.mock(lock_util, 'WaitUntilDownloadAllowed', _WaitUntilDownloadAllowed)
|
|
|
| - def _MockGetSwarmingSettings():
|
| - return _MOCK_SWARMING_SETTINGS
|
| - self.mock(waterfall_config, 'GetSwarmingSettings', _MockGetSwarmingSettings)
|
| -
|
| def _TimeBeforeNowBySeconds(self, seconds):
|
| return datetime.datetime.utcnow() - datetime.timedelta(0, seconds, 0)
|
|
|
|
|