| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import time | 5 import time |
| 6 | 6 |
| 7 from model import analysis_status | 7 from model import analysis_status |
| 8 from model.flake.flake_swarming_task import FlakeSwarmingTask | 8 from model.flake.flake_swarming_task import FlakeSwarmingTask |
| 9 from model.wf_swarming_task import WfSwarmingTask | 9 from model.wf_swarming_task import WfSwarmingTask |
| 10 from waterfall import swarming_util | 10 from waterfall import swarming_util |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 }, | 94 }, |
| 95 'tags': ['master:a', 'buildername:b', 'name:a_tests'], | 95 'tags': ['master:a', 'buildername:b', 'name:a_tests'], |
| 96 'user': 'user', | 96 'user': 'user', |
| 97 }) | 97 }) |
| 98 self.mock(swarming_util, 'GetSwarmingTaskRequest', | 98 self.mock(swarming_util, 'GetSwarmingTaskRequest', |
| 99 MockedGetSwarmingTaskRequest) | 99 MockedGetSwarmingTaskRequest) |
| 100 | 100 |
| 101 new_request_json = {} | 101 new_request_json = {} |
| 102 def MockedTriggerSwarmingTask(new_request, *_): | 102 def MockedTriggerSwarmingTask(new_request, *_): |
| 103 new_request_json.update(new_request.Serialize()) | 103 new_request_json.update(new_request.Serialize()) |
| 104 return 'new_task_id' | 104 return 'new_task_id', None |
| 105 self.mock(swarming_util, 'TriggerSwarmingTask', MockedTriggerSwarmingTask) | 105 self.mock(swarming_util, 'TriggerSwarmingTask', MockedTriggerSwarmingTask) |
| 106 | 106 |
| 107 def MockedGetSwarmingTaskName(*_): | 107 def MockedGetSwarmingTaskName(*_): |
| 108 return 'new_task_name' | 108 return 'new_task_name' |
| 109 self.mock(TriggerBaseSwarmingTaskPipeline, '_GetSwarmingTaskName', | 109 self.mock(TriggerBaseSwarmingTaskPipeline, '_GetSwarmingTaskName', |
| 110 MockedGetSwarmingTaskName) | 110 MockedGetSwarmingTaskName) |
| 111 | 111 |
| 112 master_name = 'm' | 112 master_name = 'm' |
| 113 builder_name = 'b' | 113 builder_name = 'b' |
| 114 build_number = 234 | 114 build_number = 234 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 self.assertEqual(expected_new_request_json, new_request_json) | 152 self.assertEqual(expected_new_request_json, new_request_json) |
| 153 | 153 |
| 154 swarming_task = WfSwarmingTask.Get( | 154 swarming_task = WfSwarmingTask.Get( |
| 155 master_name, builder_name, build_number, step_name) | 155 master_name, builder_name, build_number, step_name) |
| 156 self.assertIsNotNone(swarming_task) | 156 self.assertIsNotNone(swarming_task) |
| 157 self.assertEqual('new_task_id', swarming_task.task_id) | 157 self.assertEqual('new_task_id', swarming_task.task_id) |
| 158 self.assertEqual(tests, swarming_task.parameters['tests']) | 158 self.assertEqual(tests, swarming_task.parameters['tests']) |
| 159 self.assertEqual( | 159 self.assertEqual( |
| 160 waterfall_config.GetSwarmingSettings()['iterations_to_rerun'], | 160 waterfall_config.GetSwarmingSettings()['iterations_to_rerun'], |
| 161 swarming_task.parameters['iterations_to_rerun']) | 161 swarming_task.parameters['iterations_to_rerun']) |
| OLD | NEW |