[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] tests/avocado: clean-up socket directory after run
From: |
Alex Bennée |
Subject: |
[PULL 3/7] tests/avocado: clean-up socket directory after run |
Date: |
Mon, 23 Nov 2020 11:25:14 +0000 |
Previously we were leaving temporary directories behind. While the
QEMUMachine does make efforts to clean up after itself the directory
belongs to the calling function. We use TemporaryDirectory to wrap
this although we explicitly clear the reference in tearDown() as it
doesn't get cleaned up otherwise.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201117173635.29101-4-alex.bennee@linaro.org>
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index 307020be45..bf54e419da 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -171,8 +171,8 @@ class Test(avocado.Test):
self.cancel("No QEMU binary defined or found in the build tree")
def _new_vm(self, *args):
- sd = tempfile.mkdtemp(prefix="avo_qemu_sock_")
- vm = QEMUMachine(self.qemu_bin, sock_dir=sd)
+ self._sd = tempfile.TemporaryDirectory(prefix="avo_qemu_sock_")
+ vm = QEMUMachine(self.qemu_bin, sock_dir=self._sd.name)
if args:
vm.add_args(*args)
return vm
@@ -193,6 +193,7 @@ class Test(avocado.Test):
def tearDown(self):
for vm in self._vms.values():
vm.shutdown()
+ self._sd = None
def fetch_asset(self, name,
asset_hash=None, algorithm=None,
--
2.20.1
- [PULL for 5.2-rc3 0/7] various CI cleanups (scripts, avocado, gitlab), Alex Bennée, 2020/11/23
- [PULL 1/7] scripts/ci: clean up default args logic a little, Alex Bennée, 2020/11/23
- [PULL 2/7] tests: add prefixes to the bare mkdtemp calls, Alex Bennée, 2020/11/23
- [PULL 4/7] gitlab: move remaining x86 check-tcg targets to gitlab, Alex Bennée, 2020/11/23
- [PULL 3/7] tests/avocado: clean-up socket directory after run,
Alex Bennée <=
- [PULL 5/7] tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image, Alex Bennée, 2020/11/23
- [PULL 6/7] gitlab-ci: Move trace backend tests across to gitlab, Alex Bennée, 2020/11/23
- [PULL 7/7] .cirrus.yml: bump timeout period for MacOS builds, Alex Bennée, 2020/11/23
- Re: [PULL for 5.2-rc3 0/7] various CI cleanups (scripts, avocado, gitlab), Peter Maydell, 2020/11/23