| 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 | 5 |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 import cmd_helper | 9 import cmd_helper |
| 10 import logging | 10 import logging |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 timeout_time=60*5) | 86 timeout_time=60*5) |
| 87 logging.info('Installing new apk') | 87 logging.info('Installing new apk') |
| 88 self.adb.Adb().SendCommand('install -r ' + self.test_suite_full, | 88 self.adb.Adb().SendCommand('install -r ' + self.test_suite_full, |
| 89 timeout_time=60*5) | 89 timeout_time=60*5) |
| 90 logging.info('Install has completed.') | 90 logging.info('Install has completed.') |
| 91 | 91 |
| 92 def _GetTestSuiteBaseName(self): | 92 def _GetTestSuiteBaseName(self): |
| 93 """Returns the base name of the test suite.""" | 93 """Returns the base name of the test suite.""" |
| 94 # APK test suite names end with '-debug.apk' | 94 # APK test suite names end with '-debug.apk' |
| 95 return os.path.basename(self.test_suite).rsplit('-debug', 1)[0] | 95 return os.path.basename(self.test_suite).rsplit('-debug', 1)[0] |
| OLD | NEW |