diff options
author | Tony Asleson <tasleson@redhat.com> | 2022-08-23 10:28:27 -0500 |
---|---|---|
committer | Tony Asleson <tasleson@redhat.com> | 2022-09-16 10:49:37 -0500 |
commit | d05d2328e0868c60ba95d3bd87b654146c078316 (patch) | |
tree | 770dc9eb902d221d2c83bdd059b70a75c5167914 | |
parent | de0258a60054166fd3a2b1732d74e7bae85e92f5 (diff) | |
download | lvm2-d05d2328e0868c60ba95d3bd87b654146c078316.tar.gz |
lvmdbustest: Factor out tearDown implementation for re-use
-rwxr-xr-x | test/dbus/lvmdbustest.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py index 5c352313d..bee6eb085 100755 --- a/test/dbus/lvmdbustest.py +++ b/test/dbus/lvmdbustest.py @@ -419,9 +419,7 @@ class TestDbusService(unittest.TestCase): rc = self._pv_remove(pv_proxy) self.assertTrue(rc == '/') - def tearDown(self): - # If we get here it means we passed setUp, so lets remove anything - # and everything that remains, besides the PVs themselves + def clean_up(self): self.objs, self.bus = get_objects() # The self.objs[PV_INT] list only contains those which we should be @@ -447,7 +445,7 @@ class TestDbusService(unittest.TestCase): # the properties are current and correct. p.update() if p.Pv.Vg != '/': - v = ClientProxy(self.bus, p.Pv.Vg, interfaces=(VG_INT, )) + v = ClientProxy(self.bus, p.Pv.Vg, interfaces=(VG_INT,)) self._recurse_vg_delete(v, p, nested_pvs) # Check to make sure the PVs we had to start exist, else re-create @@ -465,6 +463,11 @@ class TestDbusService(unittest.TestCase): # print('Re-creating PV=', p) self._pv_create(p) + def tearDown(self): + # If we get here it means we passed setUp, so lets remove anything + # and everything that remains, besides the PVs themselves + self.clean_up() + def _check_consistency(self): # Only do consistency checks if we aren't running the unit tests # concurrently |