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

tests: fix cleanup after backup compatibility tests

Browse Source 
Allow removing VMs based on multiple prefixes at once. Removing them
separately doesn't handle all the dependencies (default_netvm, netvm)
correctly. This is needed for backup compatibility tests, where VMs are
created with `test-` prefix and `disp-tests-`. Additionally backup code
will create `disp-no-netvm`, which also may need to be removed.
This commit is contained in:
Marek Marczykowski-Górecki 2018-10-14 03:29:30 +02:00
parent 00c0b4c69f
commit 3e28ccefde
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubes/tests/__init__.py
View File

@ -902,9 +902,16 @@ class SystemTestCase(QubesTestCase):
self._remove_vm_qubes(vm) self._remove_vm_qubes(vm)
def remove_test_vms(self, xmlpath=XMLPATH, prefix=VMPREFIX): def remove_test_vms(self, xmlpath=XMLPATH, prefix=VMPREFIX):
'''Aggresively remove any domain that has name in testing namespace. '''Aggressively remove any domain that has name in testing namespace.
:param prefix: name prefix of VMs to remove, can be a list of prefixes
''' '''
if isinstance(prefix, str):
prefixes = [prefix]
else:
prefixes = prefix
del prefix
# first, remove them Qubes-way # first, remove them Qubes-way
if os.path.exists(xmlpath): if os.path.exists(xmlpath):
try: try:
@ -917,7 +924,7 @@ class SystemTestCase(QubesTestCase):
except AttributeError: except AttributeError:
host_app = qubes.Qubes() host_app = qubes.Qubes()
self.remove_vms([vm for vm in app.domains self.remove_vms([vm for vm in app.domains
if vm.name.startswith(prefix) or if any(vm.name.startswith(prefix) for prefix in prefixes) or
(isinstance(vm, qubes.vm.dispvm.DispVM) and vm.name (isinstance(vm, qubes.vm.dispvm.DispVM) and vm.name
not in host_app.domains)]) not in host_app.domains)])
if not hasattr(self, 'host_app'): if not hasattr(self, 'host_app'):
@ -933,7 +940,7 @@ class SystemTestCase(QubesTestCase):
# now remove what was only in libvirt # now remove what was only in libvirt
conn = libvirt.open(qubes.config.defaults['libvirt_uri']) conn = libvirt.open(qubes.config.defaults['libvirt_uri'])
for dom in conn.listAllDomains(): for dom in conn.listAllDomains():
if dom.name().startswith(prefix): if any(dom.name().startswith(prefix) for prefix in prefixes):
self._remove_vm_libvirt(dom) self._remove_vm_libvirt(dom)
conn.close() conn.close()
@ -948,10 +955,11 @@ class SystemTestCase(QubesTestCase):
if not os.path.exists(dirpath): if not os.path.exists(dirpath):
continue continue
for name in os.listdir(dirpath): for name in os.listdir(dirpath):
if name.startswith(prefix): if any(name.startswith(prefix) for prefix in prefixes):
vmnames.add(name) vmnames.add(name)
for vmname in vmnames: for vmname in vmnames:
self._remove_vm_disk(vmname) self._remove_vm_disk(vmname)
for prefix in prefixes:
self._remove_vm_disk_lvm(prefix) self._remove_vm_disk_lvm(prefix)
def qrexec_policy(self, service, source, destination, allow=True, def qrexec_policy(self, service, source, destination, allow=True,

6
qubes/tests/integ/backupcompatibility.py
View File

@ -123,8 +123,10 @@ class TC_00_BackupCompatibility(
qubes.tests.integ.backup.BackupTestsMixin, qubes.tests.SystemTestCase): qubes.tests.integ.backup.BackupTestsMixin, qubes.tests.SystemTestCase):
def tearDown(self): def tearDown(self):
self.remove_test_vms(prefix="test-") prefixes = ["test-", "disp-test-"]
self.remove_test_vms(prefix="disp-test-") if 'disp-no-netvm' not in self.host_app.domains:
prefixes.append('disp-no-netvm')
self.remove_test_vms(prefix=prefixes)
super(TC_00_BackupCompatibility, self).tearDown() super(TC_00_BackupCompatibility, self).tearDown()
def create_whitelisted_appmenus(self, filename): def create_whitelisted_appmenus(self, filename):