diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 13:29:01 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 13:29:01 +0000 |
| commit | 31e317379b9ffdb16a6eef9c4b5364f5894e1508 (patch) | |
| tree | f33cedec7a576ce8859646c4621906130122ffd9 /build/android/run_monkey_test.py | |
| parent | d138f4e9ab391e485b21d981b40b49f4d91f213b (diff) | |
| download | chromium_src-31e317379b9ffdb16a6eef9c4b5364f5894e1508.zip chromium_src-31e317379b9ffdb16a6eef9c4b5364f5894e1508.tar.gz chromium_src-31e317379b9ffdb16a6eef9c4b5364f5894e1508.tar.bz2 | |
Upstream latest changes from build/android/pylib.
- test_result.py cleanup and related dependencies, including fixing
run_monkey_test.py
- always use sharding for java tests
- test package parser
BUG=136980
TEST=
Review URL: https://chromiumcodereview.appspot.com/10910027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/run_monkey_test.py')
| -rwxr-xr-x | build/android/run_monkey_test.py | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/build/android/run_monkey_test.py b/build/android/run_monkey_test.py index 3a89796..ab75915 100755 --- a/build/android/run_monkey_test.py +++ b/build/android/run_monkey_test.py @@ -45,8 +45,7 @@ class MonkeyTest(python_test_base.PythonTestBase): crashed = (not before_pids or not after_pids or after_pids[0] != before_pids[0]) result = test_result.SingleTestResult(self.qualified_name, start_ms, - duration_ms, test_result.PYTHON, - log=output) + duration_ms, log=output) results = test_result.TestResults() if 'Monkey finished' in output and not crashed: @@ -69,18 +68,11 @@ def DispatchPythonTests(options): raise Exception('You have no devices attached or visible!') # Actually run the tests. - # TODO(frankf): Test sharder should really be handling the case - # where only 1 device is attached. - if len(attached_devices) > 1: - logging.debug('Sharding Python tests.') - available_tests *= len(attached_devices) - sharder = python_test_sharder.PythonTestSharder( - attached_devices, 1, available_tests) - result = sharder.RunShardedTests() - else: - logging.debug('Running Python tests serially.') - result = python_test_caller.CallPythonTest(available_tests[0], - attached_devices[0], 0) + logging.debug('Running monkey tests.') + available_tests *= len(attached_devices) + sharder = python_test_sharder.PythonTestSharder( + attached_devices, 1, available_tests) + result = sharder.RunShardedTests() result.LogFull('Monkey', 'Monkey', build_type) result.PrintAnnotation() |