shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: update dbus test_nesting

Browse Source 
Test has to use PV with suffix  pv[0..9]  otherwise
it's ignored by test suite filter.

Better fix for VG names to use prefix LVMTEST.

Skip the test for runs without LVM_TEST_DEVDIR != /dev
This commit is contained in:
Zdenek Kabelac 2021-03-26 20:21:57 +01:00
parent 1d6e1d08a8
commit 93336685f6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/dbus/lvmdbustest.py
View File

@ -26,6 +26,9 @@ g_tmo = 0
# Prefix on created objects to enable easier clean-up # Prefix on created objects to enable easier clean-up
g_prefix = os.getenv('PREFIX', '') g_prefix = os.getenv('PREFIX', '')
# Check dev dir prefix for test suite (LVM_TEST_DEVDIR
dm_dev_dir = os.getenv('DM_DEV_DIR', '/dev')
# Use the session bus instead of the system bus # Use the session bus instead of the system bus
use_session = os.getenv('LVM_DBUSD_USE_SESSION', False) use_session = os.getenv('LVM_DBUSD_USE_SESSION', False)
@ -59,10 +62,10 @@ if pv_device_list:
def vg_n(prefix=None): def vg_n(prefix=None):
name = g_prefix + '_vg' name = rs(8, '_vg')
if prefix: if prefix:
name = prefix + name name = prefix + name
return name return g_prefix + name
def lv_n(suffix=None): def lv_n(suffix=None):
@ -70,7 +73,7 @@ def lv_n(suffix=None):
s = '_lv' s = '_lv'
else: else:
s = suffix s = suffix
return g_prefix + rs(8, s) return rs(8, s)
def _is_testsuite_pv(pv_name): def _is_testsuite_pv(pv_name):
@ -338,7 +341,7 @@ class TestDbusService(unittest.TestCase):
if not pv_paths: if not pv_paths:
pv_paths = self._all_pv_object_paths() pv_paths = self._all_pv_object_paths()
vg_name = vg_n(prefix=vg_prefix) vg_name = vg_n()
vg_path = self.handle_return( vg_path = self.handle_return(
self.objs[MANAGER_INT][0].Manager.VgCreate( self.objs[MANAGER_INT][0].Manager.VgCreate(
@ -1811,7 +1814,7 @@ class TestDbusService(unittest.TestCase):
pv_object_path, vg.Vg.Pvs, "Expecting PV object path in Vg.Pvs") pv_object_path, vg.Vg.Pvs, "Expecting PV object path in Vg.Pvs")
lv = self._create_lv( lv = self._create_lv(
vg=vg.Vg, size=vg.Vg.FreeBytes, suffix="_pv") vg=vg.Vg, size=vg.Vg.FreeBytes, suffix="_pv0")
device_path = '/dev/%s/%s' % (vg.Vg.Name, lv.LvCommon.Name) device_path = '/dev/%s/%s' % (vg.Vg.Name, lv.LvCommon.Name)
new_pv_object_path = self._pv_create(device_path) new_pv_object_path = self._pv_create(device_path)
@ -1837,6 +1840,9 @@ class TestDbusService(unittest.TestCase):
# by editing lvm.conf with "devices/scan_lvs = 1" As testing # by editing lvm.conf with "devices/scan_lvs = 1" As testing
# typically utilizes loopback, this test is skipped in # typically utilizes loopback, this test is skipped in
# those environments. # those environments.
if dm_dev_dir != '/dev':
raise unittest.SkipTest('test not running in real /dev')
pv_object_path = self.objs[PV_INT][0].object_path pv_object_path = self.objs[PV_INT][0].object_path
if not self.objs[PV_INT][0].Pv.Name.startswith("/dev"): if not self.objs[PV_INT][0].Pv.Name.startswith("/dev"):
raise unittest.SkipTest('test not running in /dev') raise unittest.SkipTest('test not running in /dev')