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

tests/lvm: make the tests re-usable for other drivers

Browse Source 
in particular for the callback driver tests
This commit is contained in:
3hhh 2020-07-11 12:49:39 +02:00
parent 43fca80a5b
commit fe27b2a1eb
No known key found for this signature in database
GPG Key ID: EB03A691DB2F0833
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/tests/storage_lvm.py
View File

@ -59,6 +59,8 @@ def skipUnlessLvmPoolExists(test_item): # pylint: disable=invalid-name
return unittest.skipUnless(result, msg)(test_item) return unittest.skipUnless(result, msg)(test_item)
POOL_CLASS = ThinPool
VOLUME_CLASS = ThinVolume
POOL_CONF = {'name': 'test-lvm', POOL_CONF = {'name': 'test-lvm',
'driver': 'lvm_thin', 'driver': 'lvm_thin',
'volume_group': DEFAULT_LVM_POOL.split('/')[0], 'volume_group': DEFAULT_LVM_POOL.split('/')[0],
@ -107,7 +109,7 @@ class ThinPoolBase(qubes.tests.QubesTestCase):
``thin_pool``, or None. ``thin_pool``, or None.
''' '''
pools = [p for p in self.app.pools.values() pools = [p for p in self.app.pools.values()
if issubclass(p.__class__, ThinPool)] if issubclass(p.__class__, POOL_CLASS)]
for pool in pools: for pool in pools:
if pool.volume_group == volume_group \ if pool.volume_group == volume_group \
and pool.thin_pool == thin_pool: and pool.thin_pool == thin_pool:
@ -155,7 +157,7 @@ class TC_00_ThinPool(ThinPoolBase):
} }
vm = qubes.tests.storage.TestVM(self) vm = qubes.tests.storage.TestVM(self)
volume = self.app.get_pool(self.pool.name).init_volume(vm, config) volume = self.app.get_pool(self.pool.name).init_volume(vm, config)
self.assertIsInstance(volume, ThinVolume) self.assertIsInstance(volume, VOLUME_CLASS)
self.assertEqual(volume.name, 'root') self.assertEqual(volume.name, 'root')
self.assertEqual(volume.pool, self.pool.name) self.assertEqual(volume.pool, self.pool.name)
self.assertEqual(volume.size, qubes.config.defaults['root_img_size']) self.assertEqual(volume.size, qubes.config.defaults['root_img_size'])
@ -175,7 +177,7 @@ class TC_00_ThinPool(ThinPoolBase):
} }
vm = qubes.tests.storage.TestVM(self) vm = qubes.tests.storage.TestVM(self)
volume = self.app.get_pool(self.pool.name).init_volume(vm, config) volume = self.app.get_pool(self.pool.name).init_volume(vm, config)
self.assertIsInstance(volume, ThinVolume) self.assertIsInstance(volume, VOLUME_CLASS)
self.assertEqual(volume.name, 'root') self.assertEqual(volume.name, 'root')
self.assertEqual(volume.pool, self.pool.name) self.assertEqual(volume.pool, self.pool.name)
self.assertEqual(volume.size, qubes.config.defaults['root_img_size']) self.assertEqual(volume.size, qubes.config.defaults['root_img_size'])
@ -790,7 +792,8 @@ class TC_00_ThinPool(ThinPoolBase):
# also should be different than source volume (clone, not the same LV) # also should be different than source volume (clone, not the same LV)
self.assertNotEqual(uuid_after, source_uuid) self.assertNotEqual(uuid_after, source_uuid)
self.assertEqual(self._get_lv_origin_uuid(volume.path), source_uuid) if VOLUME_CLASS == ThinVolume:
self.assertEqual(self._get_lv_origin_uuid(volume.path), source_uuid)
expected_revisions = { expected_revisions = {
'1521065906-back': '2018-03-14T22:18:26', '1521065906-back': '2018-03-14T22:18:26',
@ -952,7 +955,7 @@ class TC_00_ThinPool(ThinPoolBase):
} }
volume = self.app.get_pool(self.pool.name).init_volume( volume = self.app.get_pool(self.pool.name).init_volume(
vm, config_snapshot) vm, config_snapshot)
self.assertIsInstance(volume, ThinVolume) self.assertIsInstance(volume, VOLUME_CLASS)
self.assertEqual(volume.name, 'root2') self.assertEqual(volume.name, 'root2')
self.assertEqual(volume.pool, self.pool.name) self.assertEqual(volume.pool, self.pool.name)
self.assertEqual(volume.size, qubes.config.defaults['root_img_size']) self.assertEqual(volume.size, qubes.config.defaults['root_img_size'])