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

tests: improve handling backups in core3

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2018-10-07 15:46:07 +02:00
parent 7a607e3731
commit c8929cfee9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qubes/tests/integ/backup.py
View File

@ -480,16 +480,7 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
os.mkdir(test_dir) os.mkdir(test_dir)
with open(os.path.join(test_dir, 'some-file.txt'), 'w') as f: with open(os.path.join(test_dir, 'some-file.txt'), 'w') as f:
f.write('test file\n') f.write('test file\n')
self.restore_backup(expect_errors=[ self.restore_backup()
'Error restoring VM test-inst-test-net, skipping: Got empty '
'response from qubesd. See journalctl in dom0 for details.',
'Error setting test-inst-test1.netvm to test-inst-test-net: '
'\'"No such domain: \\\'test-inst-test-net\\\'"\'',
])
del vms_info['test-inst-test-net']
vms_info['test-inst-test1']['properties']['netvm'] = \
str(self.app.default_netvm)
vms_info['test-inst-test1']['default']['netvm'] = True
self.assertCorrectlyRestored(vms_info, orig_hashes) self.assertCorrectlyRestored(vms_info, orig_hashes)
finally: finally:
del vms del vms

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

@ -124,6 +124,7 @@ class TC_00_BackupCompatibility(
def tearDown(self): def tearDown(self):
self.remove_test_vms(prefix="test-") self.remove_test_vms(prefix="test-")
self.remove_test_vms(prefix="disp-test-")
super(TC_00_BackupCompatibility, self).tearDown() super(TC_00_BackupCompatibility, self).tearDown()
def create_whitelisted_appmenus(self, filename): def create_whitelisted_appmenus(self, filename):