Bug 1119583 - Use Droid instead of devicemanager for xpcshell mach; r=ahal
authorGeoff Brown <gbrown@mozilla.com>
Mon, 12 Jan 2015 14:33:43 -0700
changeset 223399 4a0cf4b46f9e7c53437dacef776de06c5108b2c9
parent 223398 e381d48c24353d9c0af822f977c331dab48ddd6e
child 223400 6485d16e2d7985f8c05ab9c7d51757c663d93c55
push id28091
push userkwierso@gmail.com
push dateTue, 13 Jan 2015 03:33:36 +0000
treeherdermozilla-central@6485d16e2d79 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1119583
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1119583 - Use Droid instead of devicemanager for xpcshell mach; r=ahal
testing/xpcshell/mach_commands.py
--- a/testing/xpcshell/mach_commands.py
+++ b/testing/xpcshell/mach_commands.py
@@ -208,26 +208,26 @@ class XPCShellRunner(MozbuildObject):
         if not result and not xpcshell.sequential:
             print("Tests were run in parallel. Try running with --sequential "
                   "to make sure the failures were not caused by this.")
         return int(not result)
 
 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
 
     """Run Android xpcshell tests."""
     def run_test(self,
                  test_paths, keep_going,
                  devicemanager, ip, port, remote_test_root, no_setup, local_apk,