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

tests/backup: adjust for core3 API properties to verify after restore

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-09 03:11:53 +02:00
parent 7d1cbd6934
commit faa341ffa2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/tests/int/backup.py
View File

@ -42,11 +42,11 @@ class TC_00_Backup(qubes.tests.BackupTestsMixin, qubes.tests.QubesTestCase):
for vm in vms: for vm in vms:
self.assertIn(vm.name, self.app.domains) self.assertIn(vm.name, self.app.domains)
restored_vm = self.app.domains[vm.name] restored_vm = self.app.domains[vm.name]
for prop in ('name', 'kernel', 'uses_default_kernel', for prop in ('name', 'kernel',
'uses_default_netvm', 'memory', 'maxmem', 'kernelopts', 'memory', 'maxmem', 'kernelopts',
'uses_default_kernelopts', 'services', 'vcpus', 'pcidevs', 'services', 'vcpus', 'features'
'include_in_backups', 'default_user', 'qrexec_timeout', 'include_in_backups', 'default_user', 'qrexec_timeout',
'autostart', 'pci_strictreset', 'pci_e820_host', 'debug', 'autostart', 'pci_strictreset', 'debug',
'internal'): 'internal'):
if not hasattr(vm, prop): if not hasattr(vm, prop):
continue continue
@ -65,6 +65,11 @@ class TC_00_Backup(qubes.tests.BackupTestsMixin, qubes.tests.QubesTestCase):
self.assertEquals(orig_value, restored_value, self.assertEquals(orig_value, restored_value,
"VM {} - property {} not properly restored".format( "VM {} - property {} not properly restored".format(
vm.name, prop)) vm.name, prop))
for dev_class in ["pci", "usb"]:
for dev in vm.devices[dev_class]:
self.assertIn(dev, restored_vm.devices[dev_class])
# TODO: compare disk images
self.remove_vms(vms) self.remove_vms(vms)