Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-09-21 19:27:44 +02:00
commit 4bd9556767
3 files changed
+66 -2

No files matched your search

@@ -265,7 +265,7 @@ class VirtualBoxVM(BaseNode):
log.debug("Stop result: {}".format(result))
log.info("VirtualBox VM '{name}' [{id}] stopped".format(name=self.name, id=self.id))
# yield from asyncio.sleep(0.5) # give some time for VirtualBox to unlock the VM
yield from asyncio.sleep(0.5) # give some time for VirtualBox to unlock the VM
try:
# deactivate the first serial port
yield from self._modify_vm("--uart1 off")