diff options
author | Marian Csontos <mcsontos@redhat.com> | 2017-05-26 15:34:47 +0200 |
---|---|---|
committer | Marian Csontos <mcsontos@redhat.com> | 2017-05-26 15:39:20 +0200 |
commit | 223c594f0e9e0248739a3bbb1c98fbf509140e6b (patch) | |
tree | 30dddc1bba807d93ec01f1177e098281117b889d | |
parent | 7687ab82c8d71e5d11c915a4dd390249b8124b9a (diff) | |
download | lvm2-223c594f0e9e0248739a3bbb1c98fbf509140e6b.tar.gz |
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.
-rwxr-xr-x | test/dbus/lvmdbustest.py | 7 |
1 files changed, 6 insertions, 1 deletions
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 |