| Index: appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
|
| diff --git a/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py b/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
|
| index b6b82afc27403fab912f3b15bbe129f7c776d538..3ea72763a53e076b9697ea54f52abcb85b7184f0 100644
|
| --- a/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
|
| +++ b/appengine/findit/waterfall/test/process_swarming_task_result_pipeline_test.py
|
| @@ -143,20 +143,33 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
|
|
|
| def testCheckTestsRunStatusesNoOutPutJson(self):
|
| tests_statuses = (
|
| - process_swarming_task_result_pipeline._CheckTestsRunStatuses(None))
|
| + process_swarming_task_result_pipeline._CheckTestsRunStatuses(None, []))
|
| self.assertEqual({}, tests_statuses)
|
|
|
| def testCheckTestsRunStatuses(self):
|
| + tests = ['TestSuite1.test1', 'TestSuite1.test2']
|
| + expected_tests_statuses = {
|
| + 'TestSuite1.test1': {
|
| + 'total_run': 2,
|
| + 'SUCCESS': 2
|
| + },
|
| + 'TestSuite1.test2': {
|
| + 'total_run': 4,
|
| + 'SUCCESS': 2,
|
| + 'FAILURE': 2
|
| + }
|
| + }
|
| tests_statuses = (
|
| process_swarming_task_result_pipeline._CheckTestsRunStatuses(
|
| - _SAMPLE_FAILURE_LOG))
|
| - self.assertEqual(_EXPECTED_TESTS_STATUESE, tests_statuses)
|
| + _SAMPLE_FAILURE_LOG, tests))
|
| + self.assertEqual(expected_tests_statuses, tests_statuses)
|
|
|
| def _MockedGetSwarmingTaskFailureLog(self, *_):
|
| return _SAMPLE_FAILURE_LOG
|
|
|
| def testProcessSwarmingTaskResultPipeline(self):
|
| task_id = 'task_id1'
|
| + tests = ['TestSuite1.test1', 'TestSuite1.test2', 'TestSuite1.test3']
|
|
|
| self.mock(swarming_util, 'GetSwarmingTaskFailureLog',
|
| self._MockedGetSwarmingTaskFailureLog)
|
| @@ -168,7 +181,7 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
|
| pipeline = ProcessSwarmingTaskResultPipeline()
|
| step_name, task_info = pipeline.run(
|
| self.master_name, self.builder_name,
|
| - self.build_number, self.step_name, task_id)
|
| + self.build_number, self.step_name, task_id, tests)
|
|
|
| self.assertEqual(self.step_name, step_name)
|
| self.assertEqual('abc_tests', task_info[0])
|
| @@ -189,6 +202,7 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
|
|
|
| def testProcessSwarmingTaskResultPipelineTaskNotRunning(self):
|
| task_id = 'task_id2'
|
| + tests = ['TestSuite1.test1', 'TestSuite1.test2', 'TestSuite1.test3']
|
|
|
| WfSwarmingTask.Create(
|
| self.master_name, self.builder_name,
|
| @@ -197,7 +211,7 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
|
| pipeline = ProcessSwarmingTaskResultPipeline()
|
| step_name, task_info = pipeline.run(
|
| self.master_name, self.builder_name,
|
| - self.build_number, self.step_name, task_id)
|
| + self.build_number, self.step_name, task_id, tests)
|
|
|
| self.assertEqual(self.step_name, step_name)
|
| self.assertIsNone(task_info[0])
|
| @@ -212,6 +226,7 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
|
|
|
| def testProcessSwarmingTaskResultPipelineTaskTimeOut(self):
|
| task_id = 'task_id1'
|
| + tests = ['TestSuite1.test1', 'TestSuite1.test2', 'TestSuite1.test3']
|
|
|
| # Override swarming config settings to force a timeout.
|
| override_swarming_settings = {
|
| @@ -227,7 +242,7 @@ class ProcessSwarmingTaskResultPipelineTest(wf_testcase.WaterfallTestCase):
|
| pipeline = ProcessSwarmingTaskResultPipeline()
|
| step_name, task_info = pipeline.run(
|
| self.master_name, self.builder_name,
|
| - self.build_number, self.step_name, task_id)
|
| + self.build_number, self.step_name, task_id, tests)
|
|
|
| self.assertEqual(self.step_name, step_name)
|
| self.assertEqual('abc_tests', task_info[0])
|
|
|