Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1414795 - Throw DMError for more cases when no devices are found; r=jmaher

Browse Source
This commit is contained in:
Geoff Brown 2018-01-05 09:39:30 -07:00
parent 9a5d7373c2
commit 588ffdfd39
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
View File

@ -38,6 +38,7 @@ class DeviceManagerADB(DeviceManager):
_tempDir = None
_adb_version = None
_sdk_version = None
_noDevicesOutput = "no devices/emulators found"
connected = False
def __init__(self, host=None, port=5555, retryLimit=5, packageName='fennec',
@ -544,7 +545,7 @@ class DeviceManagerADB(DeviceManager):
# Raise a DMError when the device is missing, but not when the
# directory is empty or missing.
output = ''.join(proc.output)
if ("no devices/emulators found" in output or
if (self._noDevicesOutput in output or
("pulled" not in output and
"does not exist" not in output)):
raise DMError("getDirectory() failed to pull %s: %s" %
@ -746,6 +747,9 @@ class DeviceManagerADB(DeviceManager):
if ret_code != 0:
self._logger.error("Non-zero return code (%d) from %s" % (ret_code, finalArgs))
self._logger.error("Output: %s" % proc.output)
output = ''.join(proc.output)
if self._noDevicesOutput in output:
raise DMError(self._noDevicesOutput)
return ret_code
raise DMError("Timeout exceeded for _checkCmd call after %d retries." % retries)