tests: improve handling backups in core3

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

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):