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

tests: make test cleanup more defensive - qubes.xml load failure

Browse Source 
If qubes.xml doesn't even load, remove it anyway and clean up the VMs
the hard way.
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-10 18:16:05 +01:00 committed by Wojtek Porczyk
parent 9633573408
commit 1b69f5c213
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/tests/__init__.py
View File

@ -512,8 +512,14 @@ class SystemTestsMixin(object):
# first, remove them Qubes-way
if os.path.exists(xmlpath):
cls.remove_vms(vm for vm in qubes.Qubes(xmlpath).domains
if vm.name.startswith(prefix))
try:
cls.remove_vms(vm for vm in qubes.Qubes(xmlpath).domains
if vm.name.startswith(prefix))
except qubes.exc.QubesException:
# If qubes-test.xml is broken that much it doesn't even load,
# simply remove it. VMs will be cleaned up the hard way.
# TODO logging?
pass
os.unlink(xmlpath)
# now remove what was only in libvirt