diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2025-09-08 14:57:21 +0100 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2025-09-09 15:45:26 +0200 |
commit | 2ee187dcb55aee7f70b514db772090649235de70 (patch) | |
tree | cd5c0531caeb0bd6151bdb874f4ae75b2fc3b7dc | |
parent | e5381b041037f3918163f2b7f82415aee80cd64e (diff) | |
download | qemu-2ee187dcb55aee7f70b514db772090649235de70.zip qemu-2ee187dcb55aee7f70b514db772090649235de70.tar.gz qemu-2ee187dcb55aee7f70b514db772090649235de70.tar.bz2 |
tests/functional: avoid tearDown failure when QEMU dies
In a QEMU process under test dies unexpectedly, the 'shutdown'
method may well raise an exception. This causes the tearDown
method to fail, which means any later cleanup code fails to
get run. Most notably the log handlers don't get removed so
the base.log file from an earlier test will get polluted with
messages from any subsequent tests. The tearDown failure also
results in pages of exceptions printed on the console, which
obscures the real failure message / trace printed by the test.
Ignore any shutdown failures in the tearDown method, since any
test which cares about clean shutdown should have already
cleaned up any running VMs. The tearDown method is just there
as a safety net to cleanup resources. The base.log file will
still containing log messages from the failed 'vm.shutdown'
call too.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250908135722.3375580-4-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r-- | tests/functional/qemu_test/testcase.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu_test/testcase.py index 82a7724..faa0a4f 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -404,7 +404,10 @@ class QemuSystemTest(QemuBaseTest): def tearDown(self): for vm in self._vms.values(): - vm.shutdown() + try: + vm.shutdown() + except Exception as ex: + self.log.error("Failed to teardown VM: %s" % ex) logging.getLogger('console').removeHandler(self._console_log_fh) self._console_log_fh.close() super().tearDown() |