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

tests: be even more defensive on cleaning up VMs

Browse Source 
Don't fail even if qubes-test.xml do not load at all because of syntax
error - for example empty file.
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-23 03:07:57 +01:00
parent c5a8135fdb
commit a6c7da6061
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/tests/__init__.py
View File

@ -700,7 +700,7 @@ class SystemTestsMixin(object):
try: try:
cls.remove_vms(vm for vm in qubes.Qubes(xmlpath).domains cls.remove_vms(vm for vm in qubes.Qubes(xmlpath).domains
if vm.name.startswith(prefix)) if vm.name.startswith(prefix))
except qubes.exc.QubesException: except (qubes.exc.QubesException, lxml.etree.XMLSyntaxError):
# If qubes-test.xml is broken that much it doesn't even load, # If qubes-test.xml is broken that much it doesn't even load,
# simply remove it. VMs will be cleaned up the hard way. # simply remove it. VMs will be cleaned up the hard way.
# TODO logging? # TODO logging?