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

lvmdbustest: Re-work setUp

Browse Source 
Place the addCleanup at the end as we don't want to go through clean up
if we don't make it through setUp.  If we don't do this we can remove VGs
that we didn't create in the unit test.
This commit is contained in:
Tony Asleson 2022-09-22 17:10:13 -05:00
parent 7966f1dd18
commit 897b326ccc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/dbus/lvmdbustest.py
View File

@ -385,8 +385,7 @@ class DaemonInfo(object):
# noinspection PyUnresolvedReferences
class TestDbusService(unittest.TestCase):
def setUp(self):
self.addCleanup(self.clean_up)
self.pvs = []
# Because of the sensitive nature of running LVM tests we will only
# run if we have PVs and nothing else, so that we can be confident that
@ -395,6 +394,10 @@ class TestDbusService(unittest.TestCase):
if len(self.objs[PV_INT]) == 0:
std_err_print('No PVs present exiting!')
sys.exit(1)
for p in self.objs[PV_INT]:
self.pvs.append(p.Pv.Name)
if len(self.objs[MANAGER_INT]) != 1:
std_err_print('Expecting a manager object!')
sys.exit(1)
@ -403,9 +406,7 @@ class TestDbusService(unittest.TestCase):
std_err_print('Expecting no VGs to exist!')
sys.exit(1)
self.pvs = []
for p in self.objs[PV_INT]:
self.pvs.append(p.Pv.Name)
self.addCleanup(self.clean_up)
self.vdo = supports_vdo()
@ -460,7 +461,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 hasattr(self, "pvs") and len(self.pvs) != len(self.objs[PV_INT]):
if len(self.pvs) != len(self.objs[PV_INT]):
for p in self.pvs:
found = False
for pc in self.objs[PV_INT]: