From 223c594f0e9e0248739a3bbb1c98fbf509140e6b Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Fri, 26 May 2017 15:34:47 +0200 Subject: [PATCH] test: Fix dbus testing using testsuite - 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. --- test/dbus/lvmdbustest.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py index d9f0f8c44..3dca9d532 100755 --- a/test/dbus/lvmdbustest.py +++ b/test/dbus/lvmdbustest.py @@ -70,8 +70,12 @@ def lv_n(suffix=None): 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): - return pv_name.count('/') == 3 + return pv_name.count('/') == 3 and not _is_testsuite_pv(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 # them + self.objs, self.bus = get_objects() if len(self.pvs) != len(self.objs[PV_INT]): for p in self.pvs: found = False -- 2.43.5