Catch new exception from kvm_suprocess to avoid killing of tests.
---
client/tests/kvm/tests/virtio_console.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/client/tests/kvm/tests/virtio_console.py
b/client/tests/kvm/tests/virtio_console.py
index d8d2143..d083783 100644
--- a/client/tests/kvm/tests/virtio_console.py
+++ b/client/tests/kvm/tests/virtio_console.py
@@ -468,9 +468,13 @@ def run_virtio_console(test, params, env):
logging.debug("Executing '%s' on virtio_guest.py loop, vm: %s," +
"timeout: %s", command, vm[0].name, timeout)
vm[1].sendline(command)
- (match, data) = vm[1].read_until_last_line_matches(["PASS:",
- "FAIL:[Failed to
execute]"],
- timeout)
+ try:
+ (match, data) = vm[1].read_until_last_line_matches(["PASS:",
+ "FAIL:"],
+ timeout)
+ except (kvm_subprocess.ExpectTimeoutError):
+ match = None
+ data = None
return (match, data)
--
1.7.3.2
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
