Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: cleanup DispVMs created during tests

Browse Source 
Since those do not have specific prefix (test-) compare list of them
with original qubes.xml
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-02 18:24:49 +02:00
parent 6091bbbe88
commit 64c5b2c00f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qubes/tests/__init__.py
View File

@ -748,6 +748,13 @@ class SystemTestCase(QubesTestCase):
vmname = vm.name
app = vm.app
# avoid race with DispVM.auto_cleanup=True
try:
self.loop.run_until_complete(
asyncio.wait_for(vm.startup_lock.acquire(), 10))
except asyncio.TimeoutError:
pass
try:
# XXX .is_running() may throw libvirtError if undefined
if vm.is_running():
@ -760,7 +767,10 @@ class SystemTestCase(QubesTestCase):
except: # pylint: disable=bare-except
pass
try:
del app.domains[vm.qid]
except KeyError:
pass
vm.close()
del vm
@ -861,8 +871,17 @@ class SystemTestCase(QubesTestCase):
app = self.app
except AttributeError:
app = qubes.Qubes(xmlpath)
try:
host_app = self.host_app
except AttributeError:
host_app = qubes.Qubes()
self.remove_vms([vm for vm in app.domains
if vm.name.startswith(prefix)])
if vm.name.startswith(prefix) or
(isinstance(vm, qubes.vm.dispvm.DispVM) and vm.name
not in host_app.domains)])
if not hasattr(self, 'host_app'):
host_app.close()
del host_app
if not hasattr(self, 'app'):
app.close()
del app