Index: appengine/findit/waterfall/test/extract_signal_pipeline_test.py |
diff --git a/appengine/findit/waterfall/test/extract_signal_pipeline_test.py b/appengine/findit/waterfall/test/extract_signal_pipeline_test.py |
index 17d4b2633f34fd43a922573046d2fdc66e3e2be0..088124d4c2a4f7bb21b876aedf16227ebdbdcdeb 100644 |
--- a/appengine/findit/waterfall/test/extract_signal_pipeline_test.py |
+++ b/appengine/findit/waterfall/test/extract_signal_pipeline_test.py |
@@ -4,18 +4,17 @@ |
import os |
-from testing_utils import testing |
- |
from model.wf_analysis import WfAnalysis |
from model.wf_step import WfStep |
from pipeline_wrapper import pipeline_handlers |
from waterfall import buildbot |
from waterfall import try_job_util |
-from waterfall import waterfall_config |
from waterfall.extract_signal_pipeline import ExtractSignalPipeline |
+from waterfall.test import wf_configured_test_case |
-class ExtractSignalPipelineTest(testing.AppengineTestCase): |
+class ExtractSignalPipelineTest( |
+ wf_configured_test_case.WaterfallConfiguredTestCase): |
app_module = pipeline_handlers._APP |
def setUp(self): |
@@ -91,10 +90,6 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
with self.mock_urlfetch() as urlfetch: |
urlfetch.register_handler(step_log_url, 'If used, test should fail!') |
- def MockStepIsSupportedForMaster(*_): |
- return True |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
self._CreateAndSaveWfAnanlysis( |
master_name, builder_name, build_number) |
@@ -201,11 +196,6 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
self._CreateAndSaveWfAnanlysis( |
master_name, builder_name, build_number) |
- def MockStepIsSupportedForMaster(*_): |
- return True |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
- |
pipeline = ExtractSignalPipeline(self.FAILURE_INFO) |
signals = pipeline.run(self.FAILURE_INFO, False) |
@@ -227,9 +217,9 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
step_name = 'abc_test' |
failure_info = { |
- 'master_name': 'm', |
- 'builder_name': 'b', |
- 'build_number': 124, |
+ 'master_name': master_name, |
+ 'builder_name': builder_name, |
+ 'build_number': build_number, |
'failed': True, |
'chromium_revision': 'a_git_hash', |
'failed_steps': { |
@@ -246,11 +236,6 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
self._CreateAndSaveWfAnanlysis( |
master_name, builder_name, build_number) |
- def MockStepIsSupportedForMaster(*_): |
- return True |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
- |
pipeline = ExtractSignalPipeline() |
signals = pipeline.run(failure_info, False) |
@@ -268,13 +253,13 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
step_name = 'abc_test' |
failure_info = { |
- 'master_name': 'm', |
- 'builder_name': 'b', |
- 'build_number': 125, |
+ 'master_name': master_name, |
+ 'builder_name': builder_name, |
+ 'build_number': build_number, |
'failed': True, |
'chromium_revision': 'a_git_hash', |
'failed_steps': { |
- 'abc_test': { |
+ step_name: { |
'last_pass': 124, |
'current_failure': 125, |
'first_failure': 125, |
@@ -287,11 +272,6 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
self._CreateAndSaveWfAnanlysis( |
master_name, builder_name, build_number) |
- def MockStepIsSupportedForMaster(*_): |
- return True |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
- |
pipeline = ExtractSignalPipeline() |
signals = pipeline.run(failure_info, False) |
@@ -393,11 +373,6 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
} |
} |
- def MockStepIsSupportedForMaster(*_): |
- return True |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
- |
self._CreateAndSaveWfAnanlysis( |
master_name, builder_name, build_number) |
@@ -450,10 +425,6 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
} |
} |
- def MockStepIsSupportedForMaster(*_): |
- return True |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
self._CreateAndSaveWfAnanlysis( |
master_name, builder_name, build_number) |
@@ -466,6 +437,7 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
builder_name = 'b' |
build_number = 123 |
supported_step_name = 'abc_test' |
+ unsupported_step_name = 'step6' |
stgao
2016/03/31 18:07:13
We'd better to add 'unsupported_' to the step name
lijeffrey
2016/03/31 22:50:20
Done.
|
failure_info = { |
'master_name': master_name, |
'builder_name': 'b', |
@@ -478,19 +450,14 @@ class ExtractSignalPipelineTest(testing.AppengineTestCase): |
'current_failure': 123, |
'first_failure': 123, |
}, |
- 'not_supported': { |
+ unsupported_step_name: { |
} |
} |
} |
- def MockStepIsSupportedForMaster(step_name, _): |
- return step_name == supported_step_name |
- |
def MockGetGtestResultLog(*_): |
return None |
- self.mock(waterfall_config, 'StepIsSupportedForMaster', |
- MockStepIsSupportedForMaster) |
self.MockGetStdiolog(master_name, builder_name, build_number, |
supported_step_name) |
self.mock(buildbot, 'GetGtestResultLog', MockGetGtestResultLog) |