diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-08-24 08:22:00 +0100 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-09-05 10:32:06 +0100 |
commit | d792bc3811f22a22a46c7d9a725fd29029f54095 (patch) | |
tree | 050d6c420bae261d0909575b340dc37bf1fac2f9 | |
parent | 2b483739791b33c46e6084b51edcf62107058ae1 (diff) | |
download | qemu-d792bc3811f22a22a46c7d9a725fd29029f54095.zip qemu-d792bc3811f22a22a46c7d9a725fd29029f54095.tar.gz qemu-d792bc3811f22a22a46c7d9a725fd29029f54095.tar.bz2 |
qemu.py: make VM() a context manager
There are a number of ways to ensure that the QEMU process is shut down
when the test ends, including atexit.register(), try: finally:, or
unittest.teardown() methods. All of these require extra code and the
programmer must remember to add vm.shutdown().
A nice solution is context managers:
with VM(binary) as vm:
...
# vm is guaranteed to be shut down here
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-id: 20170824072202.26818-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r-- | scripts/qemu.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py index 880e3e8..4d8ee10 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -21,7 +21,14 @@ import qmp.qmp class QEMUMachine(object): - '''A QEMU VM''' + '''A QEMU VM + + Use this object as a context manager to ensure the QEMU process terminates:: + + with VM(binary) as vm: + ... + # vm is guaranteed to be shut down here + ''' def __init__(self, binary, args=[], wrapper=[], name=None, test_dir="/var/tmp", monitor_address=None, socket_scm_helper=None, debug=False): @@ -40,6 +47,13 @@ class QEMUMachine(object): self._socket_scm_helper = socket_scm_helper self._debug = debug + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_val, exc_tb): + self.shutdown() + return False + # This can be used to add an unused monitor instance. def add_monitor_telnet(self, ip, port): args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port) |