wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 948992 - Copy the deviceSerial to ADB's device manager. r=jgriffin

Browse Source
This commit is contained in:
Nicolas B. Pierron 2013-12-12 06:35:00 -08:00
parent e8e5537b6b
commit 955316f2a4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testing/marionette/client/marionette/runner/base.py
View File

@ -634,12 +634,14 @@ class BaseMarionetteTestRunner(object):
logcat_dir=self.logcat_dir,
gecko_path=self.gecko_path,
symbols_path=self.symbols_path,
timeout=self.timeout)
timeout=self.timeout,
device_serial=self.device_serial)
else:
self.marionette = Marionette(host=host,
port=int(port),
baseurl=self.baseurl,
timeout=self.timeout)
timeout=self.timeout,
device_serial=self.device_serial)
elif self.emulator:
self.marionette = Marionette.getMarionetteOrExit(
emulator=self.emulator,
@ -653,7 +655,8 @@ class BaseMarionetteTestRunner(object):
gecko_path=self.gecko_path,
symbols_path=self.symbols_path,
timeout=self.timeout,
sdcard=self.sdcard)
sdcard=self.sdcard,
device_serial=self.device_serial)
else:
raise Exception("must specify binary, address or emulator")

8
testing/marionette/client/marionette/runner/mixins/b2g.py
View File

@ -12,12 +12,11 @@ class B2GTestCaseMixin(object):
def __init__(self, *args, **kwargs):
self._device_manager = None
@property
def device_manager(self, *args, **kwargs):
def get_device_manager(self, *args, **kwargs):
if not self._device_manager:
dm_type = os.environ.get('DM_TRANS', 'adb')
if dm_type == 'adb':
self._device_manager = mozdevice.DeviceManagerADB()
self._device_manager = mozdevice.DeviceManagerADB(**kwargs)
elif dm_type == 'sut':
host = os.environ.get('TEST_DEVICE')
if not host:
@ -27,3 +26,6 @@ class B2GTestCaseMixin(object):
raise Exception('Unknown device manager type: %s' % dm_type)
return self._device_manager
@property
def device_manager(self):
return self.get_device_manager()