tests/avocado: clean-up socket directory after run
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>
This commit is contained in:
parent
8c175c63ee
commit
69272bec1a
|
@ -171,8 +171,8 @@ class Test(avocado.Test):
|
||||||
self.cancel("No QEMU binary defined or found in the build tree")
|
self.cancel("No QEMU binary defined or found in the build tree")
|
||||||
|
|
||||||
def _new_vm(self, *args):
|
def _new_vm(self, *args):
|
||||||
sd = tempfile.mkdtemp(prefix="avo_qemu_sock_")
|
self._sd = tempfile.TemporaryDirectory(prefix="avo_qemu_sock_")
|
||||||
vm = QEMUMachine(self.qemu_bin, sock_dir=sd)
|
vm = QEMUMachine(self.qemu_bin, sock_dir=self._sd.name)
|
||||||
if args:
|
if args:
|
||||||
vm.add_args(*args)
|
vm.add_args(*args)
|
||||||
return vm
|
return vm
|
||||||
|
@ -193,6 +193,7 @@ class Test(avocado.Test):
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
for vm in self._vms.values():
|
for vm in self._vms.values():
|
||||||
vm.shutdown()
|
vm.shutdown()
|
||||||
|
self._sd = None
|
||||||
|
|
||||||
def fetch_asset(self, name,
|
def fetch_asset(self, name,
|
||||||
asset_hash=None, algorithm=None,
|
asset_hash=None, algorithm=None,
|
||||||
|
|
Loading…
Reference in a new issue