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

tests: adjust LVM tests for non-default VG name

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-09-19 20:35:25 +02:00
parent 8b408a7a70
commit 0ea7afd245
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/tests/storage_lvm.py
View File

@ -56,8 +56,8 @@ def skipUnlessLvmPoolExists(test_item): # pylint: disable=invalid-name
POOL_CONF = {'name': 'test-lvm',
'driver': 'lvm_thin',
'volume_group': 'qubes_dom0',
'thin_pool': 'pool00'}
'volume_group': DEFAULT_LVM_POOL.split('/')[0],
'thin_pool': DEFAULT_LVM_POOL.split('/')[1]}
@skipUnlessLvmPoolExists
@ -150,7 +150,8 @@ class TC_00_ThinPool(qubes.tests.SystemTestsMixin,
vm.clone_disk_files(template_vm, pool='test-lvm')
for v_name, volume in vm.volumes.items():
if volume.save_on_stop:
expected = "/dev/qubes_dom0/{!s}-{!s}".format(vm.name, v_name)
expected = "/dev/{!s}/{!s}-{!s}".format(
DEFAULT_LVM_POOL.split('/')[0], vm.name, v_name)
self.assertEqual(volume.path, expected)
with self.assertNotRaises(qubes.exc.QubesException):
vm.start()
@ -161,7 +162,8 @@ class TC_00_ThinPool(qubes.tests.SystemTestsMixin,
vm.create_on_disk(pool='test-lvm')
for v_name, volume in vm.volumes.items():
if volume.save_on_stop:
expected = "/dev/qubes_dom0/{!s}-{!s}".format(vm.name, v_name)
expected = "/dev/{!s}/{!s}-{!s}".format(
DEFAULT_LVM_POOL.split('/')[0], vm.name, v_name)
self.assertEqual(volume.path, expected)
with self.assertNotRaises(qubes.exc.QubesException):
vm.start()