shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

test: Fix dbus testing using testsuite

Browse Source 
- Must reread all objects as PVs might be removed.
- Never consider testsuite provided PVs nested, or tearDown fails to
  remove any outstanding VGs on them.
This commit is contained in:
Marian Csontos 2017-05-26 15:34:47 +02:00
parent 7687ab82c8
commit 223c594f0e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/dbus/lvmdbustest.py
View File

@ -70,8 +70,12 @@ def lv_n(suffix=None):
return g_prefix + rs(8, s) return g_prefix + rs(8, s)
def _is_testsuite_pv(pv_name):
return g_prefix != "" and pv_name[-1].isdigit() and pv_name[:-1].endswith(g_prefix + "pv")
def is_nested_pv(pv_name): def is_nested_pv(pv_name):
return pv_name.count('/') == 3 return pv_name.count('/') == 3 and not _is_testsuite_pv(pv_name)
def _root_pv_name(res, pv_name): def _root_pv_name(res, pv_name):
@ -241,6 +245,7 @@ class TestDbusService(unittest.TestCase):
# Check to make sure the PVs we had to start exist, else re-create # Check to make sure the PVs we had to start exist, else re-create
# them # them
self.objs, self.bus = get_objects()
if len(self.pvs) != len(self.objs[PV_INT]): if len(self.pvs) != len(self.objs[PV_INT]):
for p in self.pvs: for p in self.pvs:
found = False found = False