| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 """Dispatches the instrumentation tests.""" | 5 """Dispatches the instrumentation tests.""" |
| 6 | 6 |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 | 9 |
| 10 from pylib import android_commands | 10 from pylib import android_commands |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 Returns: | 27 Returns: |
| 28 A TestRunResults object holding the results of the Java tests. | 28 A TestRunResults object holding the results of the Java tests. |
| 29 | 29 |
| 30 Raises: | 30 Raises: |
| 31 Exception: when there are no attached devices. | 31 Exception: when there are no attached devices. |
| 32 """ | 32 """ |
| 33 test_pkg = test_package.TestPackage(options.test_apk_path, | 33 test_pkg = test_package.TestPackage(options.test_apk_path, |
| 34 options.test_apk_jar_path) | 34 options.test_apk_jar_path) |
| 35 tests = test_pkg._GetAllMatchingTests( | 35 tests = test_pkg._GetAllMatchingTests( |
| 36 options.annotations, options.test_filter) | 36 options.annotations, options.exclude_annotations, options.test_filter) |
| 37 if not tests: | 37 if not tests: |
| 38 logging.warning('No instrumentation tests to run with current args.') | 38 logging.warning('No instrumentation tests to run with current args.') |
| 39 return base_test_result.TestRunResults() | 39 return base_test_result.TestRunResults() |
| 40 | 40 |
| 41 attached_devices = android_commands.GetAttachedDevices() | 41 attached_devices = android_commands.GetAttachedDevices() |
| 42 if not attached_devices: | 42 if not attached_devices: |
| 43 raise Exception('There are no devices online.') | 43 raise Exception('There are no devices online.') |
| 44 | 44 |
| 45 if options.device: | 45 if options.device: |
| 46 assert options.device in attached_devices | 46 assert options.device in attached_devices |
| 47 attached_devices = [options.device] | 47 attached_devices = [options.device] |
| 48 | 48 |
| 49 if len(attached_devices) > 1 and options.wait_for_debugger: | 49 if len(attached_devices) > 1 and options.wait_for_debugger: |
| 50 logging.warning('Debugger can not be sharded, using first available device') | 50 logging.warning('Debugger can not be sharded, using first available device') |
| 51 attached_devices = attached_devices[:1] | 51 attached_devices = attached_devices[:1] |
| 52 | 52 |
| 53 def TestRunnerFactory(device, shard_index): | 53 def TestRunnerFactory(device, shard_index): |
| 54 return test_runner.TestRunner( | 54 return test_runner.TestRunner( |
| 55 options, device, shard_index, test_pkg, []) | 55 options, device, shard_index, test_pkg, []) |
| 56 | 56 |
| 57 return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests, | 57 return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests, |
| 58 options.build_type, | 58 options.build_type, |
| 59 num_retries=options.num_retries) | 59 num_retries=options.num_retries) |
| OLD | NEW |