| 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 """Class for running uiautomator tests on a single device.""" | 5 """Class for running uiautomator tests on a single device.""" |
| 6 | 6 |
| 7 from devil.android.sdk import intent |
| 7 from pylib import constants | 8 from pylib import constants |
| 8 from pylib import flag_changer | 9 from pylib import flag_changer |
| 9 from pylib.device import intent | |
| 10 from pylib.instrumentation import test_options as instr_test_options | 10 from pylib.instrumentation import test_options as instr_test_options |
| 11 from pylib.instrumentation import test_runner as instr_test_runner | 11 from pylib.instrumentation import test_runner as instr_test_runner |
| 12 | 12 |
| 13 | 13 |
| 14 class TestRunner(instr_test_runner.TestRunner): | 14 class TestRunner(instr_test_runner.TestRunner): |
| 15 """Responsible for running a series of tests connected to a single device.""" | 15 """Responsible for running a series of tests connected to a single device.""" |
| 16 | 16 |
| 17 def __init__(self, test_options, device, shard_index, test_pkg): | 17 def __init__(self, test_options, device, shard_index, test_pkg): |
| 18 """Create a new TestRunner. | 18 """Create a new TestRunner. |
| 19 | 19 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 80 |
| 81 #override | 81 #override |
| 82 def _GenerateTestResult(self, test, _result_code, _result_bundle, statuses, | 82 def _GenerateTestResult(self, test, _result_code, _result_bundle, statuses, |
| 83 start_ms, duration_ms): | 83 start_ms, duration_ms): |
| 84 # uiautomator emits its summary status with INSTRUMENTATION_STATUS_CODE, | 84 # uiautomator emits its summary status with INSTRUMENTATION_STATUS_CODE, |
| 85 # not INSTRUMENTATION_CODE, so we have to drop if off the list of statuses. | 85 # not INSTRUMENTATION_CODE, so we have to drop if off the list of statuses. |
| 86 summary_code, summary_bundle = statuses[-1] | 86 summary_code, summary_bundle = statuses[-1] |
| 87 return super(TestRunner, self)._GenerateTestResult( | 87 return super(TestRunner, self)._GenerateTestResult( |
| 88 test, summary_code, summary_bundle, statuses[:-1], start_ms, | 88 test, summary_code, summary_bundle, statuses[:-1], start_ms, |
| 89 duration_ms) | 89 duration_ms) |
| OLD | NEW |