| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Defines TestPackageApk to help run APK-based native tests.""" | 5 """Defines TestPackageApk to help run APK-based native tests.""" |
| 6 # pylint: disable=W0212 | 6 # pylint: disable=W0212 |
| 7 | 7 |
| 8 import logging | 8 import logging |
| 9 import os | 9 import os |
| 10 import shlex | 10 import shlex |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 self._ClearFifo(device) | 124 self._ClearFifo(device) |
| 125 self._StartActivity(device) | 125 self._StartActivity(device) |
| 126 finally: | 126 finally: |
| 127 self.tool.CleanUpEnvironment() | 127 self.tool.CleanUpEnvironment() |
| 128 logfile = android_commands.NewLineNormalizer(sys.stdout) | 128 logfile = android_commands.NewLineNormalizer(sys.stdout) |
| 129 return self._WatchFifo(device, timeout=10, logfile=logfile) | 129 return self._WatchFifo(device, timeout=10, logfile=logfile) |
| 130 | 130 |
| 131 #override | 131 #override |
| 132 def Install(self, device): | 132 def Install(self, device): |
| 133 self.tool.CopyFiles() | 133 self.tool.CopyFiles() |
| 134 device.old_interface.ManagedInstall( | 134 device.Install(self.suite_path) |
| 135 self.suite_path, False, package_name=self._package_info.package) | |
| OLD | NEW |