| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Utility class to build the Swarm master BuildFactory's. | 5 """Utility class to build the Swarm master BuildFactory's. |
| 6 | 6 |
| 7 Based on chromium_factory.py and adds chromium-on-swarm-specific steps. | 7 Based on chromium_factory.py and adds chromium-on-swarm-specific steps. |
| 8 | 8 |
| 9 Common usage: | 9 Common usage: |
| 10 - For a split builder&tester configuration, use: | 10 - For a split builder&tester configuration, use: |
| 11 - One ChromiumFactory() builder with 'run_default_swarm_tests' set to the list | 11 - One ChromiumFactory() builder with 'run_default_swarm_tests' set to the list |
| 12 of tests to run on Swarm on the 'tester'. | 12 of tests to run on Swarm on the 'tester'. |
| 13 - One SwarmTestBuilder() builder named 'swarm_triggered', the builder name | 13 - One SwarmTestBuilder() builder named something like 'linux_swarm_triggered'. |
| 14 is currently hardcoded. | 14 It is defined as fp['triggered_builder'] |
| 15 | 15 |
| 16 - For a single buildertester configuration, use: | 16 - For a single buildertester configuration, use: |
| 17 - SwarmFactory() | 17 - SwarmFactory() |
| 18 """ | 18 """ |
| 19 | 19 |
| 20 from master.factory import build_factory | 20 from master.factory import build_factory |
| 21 from master.factory import chromium_factory | 21 from master.factory import chromium_factory |
| 22 from master.factory import swarm_commands | 22 from master.factory import swarm_commands |
| 23 | 23 |
| 24 | 24 |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 | 171 |
| 172 # Reorder the tests by the order specified in SWARM_TESTS. E.g. the slower | 172 # Reorder the tests by the order specified in SWARM_TESTS. E.g. the slower |
| 173 # tests are retrieved last. | 173 # tests are retrieved last. |
| 174 for swarm_test in SWARM_TESTS: | 174 for swarm_test in SWARM_TESTS: |
| 175 if swarm_test.test_name in tests: | 175 if swarm_test.test_name in tests: |
| 176 tests.remove(swarm_test.test_name) | 176 tests.remove(swarm_test.test_name) |
| 177 swarm_command_obj.AddIsolateTest(swarm_test.test_name) | 177 swarm_command_obj.AddIsolateTest(swarm_test.test_name) |
| 178 | 178 |
| 179 assert not tests | 179 assert not tests |
| 180 return f | 180 return f |
| OLD | NEW |