From c8929cfee9a39c6fdf9378aa493daf3267cd3964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 7 Oct 2018 15:46:07 +0200 Subject: [PATCH] tests: improve handling backups in core3 --- qubes/tests/integ/backup.py | 11 +---------- qubes/tests/integ/backupcompatibility.py | 1 + 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/qubes/tests/integ/backup.py b/qubes/tests/integ/backup.py index 36b4b98b..450054d3 100644 --- a/qubes/tests/integ/backup.py +++ b/qubes/tests/integ/backup.py @@ -480,16 +480,7 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase): os.mkdir(test_dir) with open(os.path.join(test_dir, 'some-file.txt'), 'w') as f: f.write('test file\n') - self.restore_backup(expect_errors=[ - '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.restore_backup() self.assertCorrectlyRestored(vms_info, orig_hashes) finally: del vms diff --git a/qubes/tests/integ/backupcompatibility.py b/qubes/tests/integ/backupcompatibility.py index 43a2a4e1..53165d2c 100644 --- a/qubes/tests/integ/backupcompatibility.py +++ b/qubes/tests/integ/backupcompatibility.py @@ -124,6 +124,7 @@ class TC_00_BackupCompatibility( def tearDown(self): self.remove_test_vms(prefix="test-") + self.remove_test_vms(prefix="disp-test-") super(TC_00_BackupCompatibility, self).tearDown() def create_whitelisted_appmenus(self, filename):