From 4d9b95cde48fe1b9abf70a5c7c2edcdb3199776d Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 30 Jan 2017 11:38:17 +0100 Subject: CSIT-514: Kill Qemu when it does not respond Change-Id: Id13c7fd51e693a273637c80cb35a159434be4826 Signed-off-by: Tibor Frank --- resources/libraries/python/QemuUtils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources/libraries/python/QemuUtils.py') diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index 37a8863a2e..a4e14d2427 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -18,7 +18,7 @@ import json from robot.api import logger -from resources.libraries.python.ssh import SSH +from resources.libraries.python.ssh import SSH, SSHTimeout from resources.libraries.python.constants import Constants from resources.libraries.python.topology import NodeType @@ -519,7 +519,7 @@ class QemuUtils(object): # Wait until VM boot try: self._wait_until_vm_boot() - except RuntimeError: + except (RuntimeError, SSHTimeout): self.qemu_kill() self.qemu_clear_socks() raise -- cgit 1.2.3-korg