Bug 1495863 - Pass mozrunner adb path when creating ADBHost; r=bc
authorGeoff Brown <gbrown@mozilla.com>
Tue, 02 Oct 2018 16:55:10 -0600
changeset 495065 b7319f0a16f5dd6f60f83f7a268b3a935db2b1d7
parent 495064 2bfca7a1d88be55d2d784e3647226272908b9b12
child 495066 ee039301d7c804b19761b3ea20ee335572ca66a9
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbc
bugs1495863
milestone64.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 1495863 - Pass mozrunner adb path when creating ADBHost; r=bc
testing/mozbase/mozrunner/mozrunner/devices/base.py
testing/mozbase/mozrunner/mozrunner/devices/emulator.py
--- a/testing/mozbase/mozrunner/mozrunner/devices/base.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/base.py
@@ -114,17 +114,17 @@ class Device(object):
         # Ideally all applications would read the profile the same way, but in practice
         # this isn't true. Perform application specific profile-related setup if necessary.
         if hasattr(self.app_ctx, 'setup_profile'):
             for remote_path in self.app_ctx.remote_backup_files:
                 self.backup_file(remote_path)
             self.app_ctx.setup_profile(profile)
 
     def _get_online_devices(self):
-        adbhost = ADBHost()
+        adbhost = ADBHost(adb=self.app_ctx.adb)
         devices = adbhost.devices()
         return [d['device_serial'] for d in devices
                 if d['state'] != 'offline'
                 if not d['device_serial'].startswith('emulator')]
 
     def connect(self):
         """
         Connects to a running device. If no serial was specified in the
--- a/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
@@ -137,17 +137,17 @@ class BaseEmulator(Device):
                 raise TimeoutException(
                     'timed out waiting for emulator to start')
             devices = set(self._get_online_devices())
         devices = devices - original_devices
         self.serial = devices.pop()
         self.connect()
 
     def _get_online_devices(self):
-        adbhost = ADBHost()
+        adbhost = ADBHost(adb=self.app_ctx.adb)
         return [d['device_serial'] for d in adbhost.devices() if d['state'] != 'offline' if
                 d['device_serial'].startswith('emulator')]
 
     def connect(self):
         """
         Connects to a running device. If no serial was specified in the
         constructor, defaults to the first entry in `adb devices`.
         """