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

tests/backup: handle non-default pool in BackupTestsMixin

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-09-26 00:55:27 +02:00
parent ae42308f5f
commit 226695534b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,18 +94,19 @@ class BackupTestsMixin(qubes.tests.SystemTestsMixin):
f.close() f.close()
# NOTE: this was create_basic_vms # NOTE: this was create_basic_vms
def create_backup_vms(self): def create_backup_vms(self, pool=None):
template = self.app.default_template template = self.app.default_template
vms = [] vms = []
vmname = self.make_vm_name('test-net') vmname = self.make_vm_name('test-net')
self.log.debug("Creating %s" % vmname) self.log.debug("Creating %s" % vmname)
testnet = self.app.add_new_vm(qubes.vm.appvm.AppVM, testnet = self.app.add_new_vm(qubes.vm.appvm.AppVM,
name=vmname, template=template, provides_network=True, label='red') name=vmname, template=template, provides_network=True,
testnet.create_on_disk() label='red')
testnet.create_on_disk(pool=pool)
testnet.features['services/ntpd'] = True testnet.features['services/ntpd'] = True
vms.append(testnet) vms.append(testnet)
self.fill_image(testnet.volumes['private'].path, 20*1024*1024) self.fill_image(testnet.storage.export('private'), 20*1024*1024)
vmname = self.make_vm_name('test1') vmname = self.make_vm_name('test1')
self.log.debug("Creating %s" % vmname) self.log.debug("Creating %s" % vmname)
@ -113,9 +114,9 @@ class BackupTestsMixin(qubes.tests.SystemTestsMixin):
name=vmname, template=template, label='red') name=vmname, template=template, label='red')
testvm1.uses_default_netvm = False testvm1.uses_default_netvm = False
testvm1.netvm = testnet testvm1.netvm = testnet
testvm1.create_on_disk() testvm1.create_on_disk(pool=pool)
vms.append(testvm1) vms.append(testvm1)
self.fill_image(testvm1.volumes['private'].path, 100*1024*1024) self.fill_image(testvm1.storage.export('private'), 100 * 1024 * 1024)
vmname = self.make_vm_name('testhvm1') vmname = self.make_vm_name('testhvm1')
self.log.debug("Creating %s" % vmname) self.log.debug("Creating %s" % vmname)
@ -123,23 +124,24 @@ class BackupTestsMixin(qubes.tests.SystemTestsMixin):
name=vmname, name=vmname,
hvm=True, hvm=True,
label='red') label='red')
testvm2.create_on_disk() testvm2.create_on_disk(pool=pool)
self.fill_image(testvm2.volumes['root'].path, 1024 * 1024 * 1024, True) self.fill_image(testvm2.storage.export('root'), 1024 * 1024 * 1024, \
True)
vms.append(testvm2) vms.append(testvm2)
vmname = self.make_vm_name('template') vmname = self.make_vm_name('template')
self.log.debug("Creating %s" % vmname) self.log.debug("Creating %s" % vmname)
testvm3 = self.app.add_new_vm(qubes.vm.templatevm.TemplateVM, testvm3 = self.app.add_new_vm(qubes.vm.templatevm.TemplateVM,
name=vmname, label='red') name=vmname, label='red')
testvm3.create_on_disk() testvm3.create_on_disk(pool=pool)
self.fill_image(testvm3.volumes['root'].path, 100 * 1024 * 1024, True) self.fill_image(testvm3.storage.export('root'), 100 * 1024 * 1024, True)
vms.append(testvm3) vms.append(testvm3)
vmname = self.make_vm_name('custom') vmname = self.make_vm_name('custom')
self.log.debug("Creating %s" % vmname) self.log.debug("Creating %s" % vmname)
testvm4 = self.app.add_new_vm(qubes.vm.appvm.AppVM, testvm4 = self.app.add_new_vm(qubes.vm.appvm.AppVM,
name=vmname, template=testvm3, label='red') name=vmname, template=testvm3, label='red')
testvm4.create_on_disk() testvm4.create_on_disk(pool=pool)
vms.append(testvm4) vms.append(testvm4)
self.app.save() self.app.save()
@ -327,9 +329,9 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.QubesTestCase):
self.fill_image( self.fill_image(
os.path.join(hvmtemplate.dir_path, '00file'), os.path.join(hvmtemplate.dir_path, '00file'),
195 * 1024 * 1024 - 4096 * 3) 195 * 1024 * 1024 - 4096 * 3)
self.fill_image(hvmtemplate.volumes['private'].path, self.fill_image(hvmtemplate.storage.export('private'),
195 * 1024 * 1024 - 4096 * 3) 195 * 1024 * 1024 - 4096 * 3)
self.fill_image(hvmtemplate.volumes['root'].path, 1024 * 1024 * 1024, self.fill_image(hvmtemplate.storage.export('root'), 1024 * 1024 * 1024,
sparse=True) sparse=True)
vms.append(hvmtemplate) vms.append(hvmtemplate)
self.app.save() self.app.save()