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

tests: fix backup test to not break default template...

Browse Source 
By default AppVM is template based. This means vm.root_img points at
default template's root image. Change this to StandaloneVM to have
independent root.img.
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-13 14:03:53 +01:00 committed by Wojtek Porczyk
parent e557fe9989
commit 019678bf4d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/tests/__init__.py
View File

@ -42,6 +42,7 @@ import qubes.config
import qubes.events import qubes.events
import qubes.backup import qubes.backup
import qubes.exc import qubes.exc
import qubes.vm.standalonevm
XMLPATH = '/var/lib/qubes/qubes-test.xml' XMLPATH = '/var/lib/qubes/qubes-test.xml'
CLASS_XMLPATH = '/var/lib/qubes/qubes-class-test.xml' CLASS_XMLPATH = '/var/lib/qubes/qubes-class-test.xml'
@ -707,7 +708,8 @@ class BackupTestsMixin(SystemTestsMixin):
vmname = self.make_vm_name('testhvm1') vmname = self.make_vm_name('testhvm1')
if self.verbose: if self.verbose:
print >>sys.stderr, "-> Creating %s" % vmname print >>sys.stderr, "-> Creating %s" % vmname
testvm2 = self.app.add_new_vm(qubes.vm.appvm.AppVM, name=vmname, testvm2 = self.app.add_new_vm(qubes.vm.standalonevm.StandaloneVM,
name=vmname,
hvm=True, label='red') hvm=True, label='red')
testvm2.create_on_disk() testvm2.create_on_disk()
self.fill_image(testvm2.root_img, 1024*1024*1024, True) self.fill_image(testvm2.root_img, 1024*1024*1024, True)