Merge 2.1 into 2.2

This commit is contained in:
grossmj
2019-03-01 17:23:49 +07:00
4 changed files with 25 additions and 4 deletions

View File

@ -1013,7 +1013,7 @@ class QemuVM(BaseNode):
if self.on_close == "shutdown_signal":
await self._control_vm("system_powerdown")
await gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=30)
await gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=120)
else:
self._process.terminate()
await gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=3)