Bug 1041424 - Raise a helpful exception if B2GDeviceRunner is used with no devices attached, r=ahal

This commit is contained in:
James Graham 2014-07-21 17:13:25 +01:00
parent 3600bd622d
commit 79842cd73a

View File

@ -35,7 +35,7 @@ class Device(object):
"""
remote_ini = self.app_ctx.remote_profiles_ini
if not self.dm.fileExists(remote_ini):
raise Exception("Remote file '%s' not found" % remote_ini)
raise IOError("Remote file '%s' not found" % remote_ini)
local_ini = tempfile.NamedTemporaryFile()
self.dm.getFile(remote_ini, local_ini.name)
@ -121,7 +121,14 @@ class Device(object):
if self.connected:
return
serial = self.serial or self._get_online_devices()[0]
if self.serial:
serial = self.serial
else:
online_devices = self._get_online_devices()
if not online_devices:
raise IOError("No devices connected. Ensure the device is on and remote debugging via adb is enabled in the settings.")
serial = online_devices[0]
self.dm._deviceSerial = serial
self.dm.connect()
self.connected = True