tests: be even more defensive on cleaning up VMs

Don't fail even if qubes-test.xml do not load at all because of syntax error - for example empty file.
2017-02-23 03:07:57 +01:00 · 2017-02-23 03:07:57 +01:00 · a6c7da6061
commit a6c7da6061
parent c5a8135fdb
1 changed files with 1 additions and 1 deletions
--- a/qubes/tests/init.py
+++ b/qubes/tests/init.py
@ -700,7 +700,7 @@ class SystemTestsMixin(object):
            try:
                cls.remove_vms(vm for vm in qubes.Qubes(xmlpath).domains
                    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,
                #  simply remove it. VMs will be cleaned up the hard way.
                # TODO logging?