| 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 waterfall import swarming_util | 9 from waterfall import swarming_util |
| 10 from waterfall.swarming_task_request import SwarmingTaskRequest | 10 from waterfall.swarming_task_request import SwarmingTaskRequest |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 }, | 89 }, |
| 90 'tags': ['master:a', 'buildername:b', 'name:a_tests'], | 90 'tags': ['master:a', 'buildername:b', 'name:a_tests'], |
| 91 'user': 'user', | 91 'user': 'user', |
| 92 }) | 92 }) |
| 93 self.mock(swarming_util, 'GetSwarmingTaskRequest', | 93 self.mock(swarming_util, 'GetSwarmingTaskRequest', |
| 94 MockedGetSwarmingTaskRequest) | 94 MockedGetSwarmingTaskRequest) |
| 95 | 95 |
| 96 new_request_json = {} | 96 new_request_json = {} |
| 97 def MockedTriggerSwarmingTask(new_request, *_): | 97 def MockedTriggerSwarmingTask(new_request, *_): |
| 98 new_request_json.update(new_request.Serialize()) | 98 new_request_json.update(new_request.Serialize()) |
| 99 return 'new_task_id' | 99 return 'new_task_id', None |
| 100 self.mock(swarming_util, 'TriggerSwarmingTask', MockedTriggerSwarmingTask) | 100 self.mock(swarming_util, 'TriggerSwarmingTask', MockedTriggerSwarmingTask) |
| 101 | 101 |
| 102 def MockedGetSwarmingTaskName(*_): | 102 def MockedGetSwarmingTaskName(*_): |
| 103 return 'new_task_name' | 103 return 'new_task_name' |
| 104 self.mock(TriggerFlakeSwarmingTaskPipeline, '_GetSwarmingTaskName', | 104 self.mock(TriggerFlakeSwarmingTaskPipeline, '_GetSwarmingTaskName', |
| 105 MockedGetSwarmingTaskName) | 105 MockedGetSwarmingTaskName) |
| 106 | 106 |
| 107 master_name = 'm' | 107 master_name = 'm' |
| 108 builder_name = 'b' | 108 builder_name = 'b' |
| 109 build_number = 234 | 109 build_number = 234 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 self.assertEqual(expected_new_request_json, new_request_json) | 147 self.assertEqual(expected_new_request_json, new_request_json) |
| 148 | 148 |
| 149 swarming_task = FlakeSwarmingTask.Get( | 149 swarming_task = FlakeSwarmingTask.Get( |
| 150 master_name, builder_name, build_number, step_name, tests[0]) | 150 master_name, builder_name, build_number, step_name, tests[0]) |
| 151 self.assertIsNotNone(swarming_task) | 151 self.assertIsNotNone(swarming_task) |
| 152 self.assertEqual('new_task_id', swarming_task.task_id) | 152 self.assertEqual('new_task_id', swarming_task.task_id) |
| 153 self.assertEqual(tests, swarming_task.parameters['tests']) | 153 self.assertEqual(tests, swarming_task.parameters['tests']) |
| 154 self.assertEqual( | 154 self.assertEqual( |
| 155 pipeline._GetIterationsToRerun(), | 155 pipeline._GetIterationsToRerun(), |
| 156 swarming_task.parameters['iterations_to_rerun']) | 156 swarming_task.parameters['iterations_to_rerun']) |
| OLD | NEW |