Index: build/android/pylib/gtest/test_package_apk.py |
diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py |
index 1d39e4dc4ccc3cfd4317002e9683dfe0939d47d6..16fe998100742e7f4a122dd3f0404323fa1d130c 100644 |
--- a/build/android/pylib/gtest/test_package_apk.py |
+++ b/build/android/pylib/gtest/test_package_apk.py |
@@ -15,7 +15,7 @@ import time |
from pylib import android_commands |
from pylib import constants |
from pylib import pexpect |
-from pylib.android_commands import errors |
+from pylib.device import adb_wrapper |
from pylib.gtest.test_package import TestPackage |
@@ -38,13 +38,14 @@ class TestPackageApk(TestPackage): |
'%s-debug.apk' % suite_name) |
self._package_info = constants.PACKAGE_INFO['gtest'] |
- def _CreateCommandLineFileOnDevice(self, adb, options): |
+ def _CreateCommandLineFileOnDevice(self, device, options): |
command_line_file = tempfile.NamedTemporaryFile() |
# GTest expects argv[0] to be the executable path. |
command_line_file.write(self.suite_name + ' ' + options) |
command_line_file.flush() |
- adb.PushIfNeeded(command_line_file.name, |
- self._package_info.cmdline_file) |
+ device.old_interface.PushIfNeeded( |
+ command_line_file.name, |
+ self._package_info.cmdline_file) |
def _GetFifo(self): |
# The test.fifo path is determined by: |
@@ -53,24 +54,24 @@ class TestPackageApk(TestPackage): |
# testing/android/native_test_launcher.cc |
return '/data/data/' + self._package_info.package + '/files/test.fifo' |
- def _ClearFifo(self, adb): |
- adb.RunShellCommand('rm -f ' + self._GetFifo()) |
+ def _ClearFifo(self, device): |
+ device.old_interface.RunShellCommand('rm -f ' + self._GetFifo()) |
- def _WatchFifo(self, adb, timeout, logfile=None): |
+ def _WatchFifo(self, device, timeout, logfile=None): |
for i in range(10): |
- if adb.FileExistsOnDevice(self._GetFifo()): |
+ if device.old_interface.FileExistsOnDevice(self._GetFifo()): |
logging.info('Fifo created.') |
break |
time.sleep(i) |
else: |
- raise errors.DeviceUnresponsiveError( |
+ raise adb_wrapper.DeviceUnreachableError( |
'Unable to find fifo on device %s ' % self._GetFifo()) |
- args = shlex.split(adb.Adb()._target_arg) |
+ args = shlex.split(device.old_interface.Adb()._target_arg) |
args += ['shell', 'cat', self._GetFifo()] |
return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile) |
- def _StartActivity(self, adb): |
- adb.StartActivity( |
+ def _StartActivity(self, device): |
+ device.old_interface.StartActivity( |
self._package_info.package, |
self._package_info.activity, |
wait_for_completion=True, |
@@ -78,30 +79,30 @@ class TestPackageApk(TestPackage): |
force_stop=True) |
#override |
- def ClearApplicationState(self, adb): |
- adb.ClearApplicationState(self._package_info.package) |
+ def ClearApplicationState(self, device): |
+ device.old_interface.ClearApplicationState(self._package_info.package) |
# Content shell creates a profile on the sdscard which accumulates cache |
# files over time. |
if self.suite_name == 'content_browsertests': |
- adb.RunShellCommand( |
- 'rm -r %s/content_shell' % adb.GetExternalStorage(), |
+ device.old_interface.RunShellCommand( |
+ 'rm -r %s/content_shell' % device.old_interface.GetExternalStorage(), |
timeout_time=60 * 2) |
#override |
- def CreateCommandLineFileOnDevice(self, adb, test_filter, test_arguments): |
+ def CreateCommandLineFileOnDevice(self, device, test_filter, test_arguments): |
self._CreateCommandLineFileOnDevice( |
- adb, '--gtest_filter=%s %s' % (test_filter, test_arguments)) |
+ device, '--gtest_filter=%s %s' % (test_filter, test_arguments)) |
#override |
- def GetAllTests(self, adb): |
- self._CreateCommandLineFileOnDevice(adb, '--gtest_list_tests') |
+ def GetAllTests(self, device): |
+ self._CreateCommandLineFileOnDevice(device, '--gtest_list_tests') |
try: |
self.tool.SetupEnvironment() |
# Clear and start monitoring logcat. |
- self._ClearFifo(adb) |
- self._StartActivity(adb) |
+ self._ClearFifo(device) |
+ self._StartActivity(device) |
# Wait for native test to complete. |
- p = self._WatchFifo(adb, timeout=30 * self.tool.GetTimeoutScale()) |
+ p = self._WatchFifo(device, timeout=30 * self.tool.GetTimeoutScale()) |
p.expect('<<ScopedMainEntryLogger') |
p.close() |
finally: |
@@ -111,18 +112,18 @@ class TestPackageApk(TestPackage): |
return self._ParseGTestListTests(content) |
#override |
- def SpawnTestProcess(self, adb): |
+ def SpawnTestProcess(self, device): |
try: |
self.tool.SetupEnvironment() |
- self._ClearFifo(adb) |
- self._StartActivity(adb) |
+ self._ClearFifo(device) |
+ self._StartActivity(device) |
finally: |
self.tool.CleanUpEnvironment() |
logfile = android_commands.NewLineNormalizer(sys.stdout) |
- return self._WatchFifo(adb, timeout=10, logfile=logfile) |
+ return self._WatchFifo(device, timeout=10, logfile=logfile) |
#override |
- def Install(self, adb): |
+ def Install(self, device): |
self.tool.CopyFiles() |
- adb.ManagedInstall(self.suite_path, False, |
- package_name=self._package_info.package) |
+ device.old_interface.ManagedInstall( |
+ self.suite_path, False, package_name=self._package_info.package) |