| 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.instrumentation import test_options as instr_test_options | 7 from pylib.instrumentation import test_options as instr_test_options |
| 8 from pylib.instrumentation import test_runner as instr_test_runner | 8 from pylib.instrumentation import test_runner as instr_test_runner |
| 9 | 9 |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 test_options.build_type, | 28 test_options.build_type, |
| 29 test_options.tool, | 29 test_options.tool, |
| 30 test_options.cleanup_test_files, | 30 test_options.cleanup_test_files, |
| 31 test_options.push_deps, | 31 test_options.push_deps, |
| 32 test_options.annotations, | 32 test_options.annotations, |
| 33 test_options.exclude_annotations, | 33 test_options.exclude_annotations, |
| 34 test_options.test_filter, | 34 test_options.test_filter, |
| 35 test_options.test_data, | 35 test_options.test_data, |
| 36 test_options.save_perf_json, | 36 test_options.save_perf_json, |
| 37 test_options.screenshot_failures, | 37 test_options.screenshot_failures, |
| 38 test_options.disable_assertions, | |
| 39 wait_for_debugger=False, | 38 wait_for_debugger=False, |
| 40 test_apk=None, | 39 test_apk=None, |
| 41 test_apk_path=None, | 40 test_apk_path=None, |
| 42 test_apk_jar_path=None) | 41 test_apk_jar_path=None) |
| 43 super(TestRunner, self).__init__(instrumentation_options, device, | 42 super(TestRunner, self).__init__(instrumentation_options, device, |
| 44 shard_index, test_pkg, ports_to_forward) | 43 shard_index, test_pkg, ports_to_forward) |
| 45 | 44 |
| 46 self.package_name = test_options.package_name | 45 self.package_name = test_options.package_name |
| 47 | 46 |
| 48 #override | 47 #override |
| 49 def InstallTestPackage(self): | 48 def InstallTestPackage(self): |
| 50 self.test_pkg.Install(self.adb) | 49 self.test_pkg.Install(self.adb) |
| 51 | 50 |
| 52 #override | 51 #override |
| 53 def PushDataDeps(self): | 52 def PushDataDeps(self): |
| 54 pass | 53 pass |
| 55 | 54 |
| 56 #override | 55 #override |
| 57 def _RunTest(self, test, timeout): | 56 def _RunTest(self, test, timeout): |
| 58 self.adb.ClearApplicationState(self.package_name) | 57 self.adb.ClearApplicationState(self.package_name) |
| 59 if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test): | 58 if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test): |
| 60 self.flags.RemoveFlags(['--disable-fre']) | 59 self.flags.RemoveFlags(['--disable-fre']) |
| 61 else: | 60 else: |
| 62 self.flags.AddFlags(['--disable-fre']) | 61 self.flags.AddFlags(['--disable-fre']) |
| 63 return self.adb.RunUIAutomatorTest( | 62 return self.adb.RunUIAutomatorTest( |
| 64 test, self.test_pkg.GetPackageName(), timeout) | 63 test, self.test_pkg.GetPackageName(), timeout) |
| OLD | NEW |