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

tests/lvm: re-introduce POOL_CONF

Browse Source 
It's still needed by the lvm integration tests. If possible, it should
be avoided inside lvm unit tests though as using it will break
compatibility with callback unit tests.
This commit is contained in:
3hhh 2020-11-17 17:39:41 +01:00
parent 9e26bfd432
commit c717dacd8d
No known key found for this signature in database
GPG Key ID: EB03A691DB2F0833
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes/tests/storage_lvm.py
View File

@ -58,6 +58,13 @@ def skipUnlessLvmPoolExists(test_item): # pylint: disable=invalid-name
msg = 'LVM thin pool {!r} does not exist'.format(DEFAULT_LVM_POOL) msg = 'LVM thin pool {!r} does not exist'.format(DEFAULT_LVM_POOL)
return unittest.skipUnless(result, msg)(test_item) return unittest.skipUnless(result, msg)(test_item)
POOL_CONF = {'name': 'test-lvm',
'driver': 'lvm_thin',
'volume_group': DEFAULT_LVM_POOL.split('/')[0],
'thin_pool': DEFAULT_LVM_POOL.split('/')[1]}
class ThinPoolBase(qubes.tests.QubesTestCase): class ThinPoolBase(qubes.tests.QubesTestCase):
''' Sanity tests for :py:class:`qubes.storage.lvm.ThinPool` ''' ''' Sanity tests for :py:class:`qubes.storage.lvm.ThinPool` '''
@ -71,10 +78,7 @@ class ThinPoolBase(qubes.tests.QubesTestCase):
''' Other test classes (e.g. callback) may use this to test their own config. ''' ''' Other test classes (e.g. callback) may use this to test their own config. '''
conf = pool_conf conf = pool_conf
if not conf: if not conf:
conf = {'name': 'test-lvm', conf = POOL_CONF
'driver': 'lvm_thin',
'volume_group': DEFAULT_LVM_POOL.split('/')[0],
'thin_pool': DEFAULT_LVM_POOL.split('/')[1]}
cls.pool_class = pool_class cls.pool_class = pool_class
cls.volume_class = volume_class cls.volume_class = volume_class