| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 test_timeout=None, |
| 59 num_retries=options.num_retries) | 60 num_retries=options.num_retries) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 16370005:
[android] Remove timeout for instrumentation tests. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src