From 804a0db75cba4dd77dad622e14e93ebaadb41e6e Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Mon, 12 Jan 2015 14:33:43 -0700 Subject: [PATCH] Bug 1119583 - Use Droid instead of devicemanager for xpcshell mach; r=ahal --- testing/xpcshell/mach_commands.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/xpcshell/mach_commands.py b/testing/xpcshell/mach_commands.py index e5f9989b918..3fa9e822de9 100644 --- a/testing/xpcshell/mach_commands.py +++ b/testing/xpcshell/mach_commands.py @@ -213,16 +213,16 @@ class XPCShellRunner(MozbuildObject): class AndroidXPCShellRunner(MozbuildObject): """Get specified DeviceManager""" def get_devicemanager(self, devicemanager, ip, port, remote_test_root): - from mozdevice import devicemanagerADB, devicemanagerSUT + import mozdevice dm = None if devicemanager == "adb": if ip: - dm = devicemanagerADB.DeviceManagerADB(ip, port, packageName=None, deviceRoot=remote_test_root) + dm = mozdevice.DroidADB(ip, port, packageName=None, deviceRoot=remote_test_root) else: - dm = devicemanagerADB.DeviceManagerADB(packageName=None, deviceRoot=remote_test_root) + dm = mozdevice.DroidADB(packageName=None, deviceRoot=remote_test_root) else: if ip: - dm = devicemanagerSUT.DeviceManagerSUT(ip, port, deviceRoot=remote_test_root) + dm = mozdevice.DroidSUT(ip, port, deviceRoot=remote_test_root) else: raise Exception("You must provide a device IP to connect to via the --ip option") return dm