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 pylib import constants | 7 from pylib import constants |
8 from pylib import flag_changer | 8 from pylib import flag_changer |
9 from pylib.device import intent | 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 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 else: | 67 else: |
68 self.flags.AddFlags(['--disable-fre']) | 68 self.flags.AddFlags(['--disable-fre']) |
69 self.device.StartActivity( | 69 self.device.StartActivity( |
70 intent.Intent(action='android.intent.action.MAIN', | 70 intent.Intent(action='android.intent.action.MAIN', |
71 activity=self._activity, | 71 activity=self._activity, |
72 package=self._package), | 72 package=self._package), |
73 blocking=True, | 73 blocking=True, |
74 force_stop=True) | 74 force_stop=True) |
75 cmd = ['uiautomator', 'runtest', | 75 cmd = ['uiautomator', 'runtest', |
76 self.test_pkg.UIAUTOMATOR_PATH + self.test_pkg.GetPackageName(), | 76 self.test_pkg.UIAUTOMATOR_PATH + self.test_pkg.GetPackageName(), |
77 '-e', 'class', test] | 77 '-e', 'class', test, |
| 78 '-e', 'test_package', self._package] |
78 return self.device.RunShellCommand(cmd, timeout=timeout, retries=0) | 79 return self.device.RunShellCommand(cmd, timeout=timeout, retries=0) |
79 | 80 |
80 #override | 81 #override |
81 def _GenerateTestResult(self, test, instr_statuses, start_ms, duration_ms): | 82 def _GenerateTestResult(self, test, instr_statuses, start_ms, duration_ms): |
82 # uiautomator emits its summary status with INSTRUMENTATION_STATUS_CODE, | 83 # uiautomator emits its summary status with INSTRUMENTATION_STATUS_CODE, |
83 # not INSTRUMENTATION_CODE, so we have to drop if off the list of statuses. | 84 # not INSTRUMENTATION_CODE, so we have to drop if off the list of statuses. |
84 return super(TestRunner, self)._GenerateTestResult( | 85 return super(TestRunner, self)._GenerateTestResult( |
85 test, instr_statuses[:-1], start_ms, duration_ms) | 86 test, instr_statuses[:-1], start_ms, duration_ms) |
OLD | NEW |