Merge release branch 4.8 to master

* 4.8:
  lower the time we wait for interfaces to appear
This commit is contained in:
Will Stevens 2016-05-26 15:51:31 -04:00
commit ff0b095028
1 changed files with 1 additions and 2 deletions

View File

@ -235,8 +235,7 @@ class CsDevice:
continue
self.devlist.append(vals[0])
def waitfordevice(self, timeout=15):
""" Wait up to 15 seconds for a device to become available """
def waitfordevice(self, timeout=2):
count = 0
while count < timeout:
if self.dev in self.devlist: