db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-07-17 07:22:20 +02:00
Code Issues Releases Activity

[PBCKP-304] removed ProbackupTest.clean_all() GC magic, simplified ProbackupTest.tearDown()

Browse Source
This commit is contained in:
Ivan Lazarev
2022-11-09 03:44:47 +03:00
parent a2c1e6d6b4
commit cda016c955
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/helpers/ptrack_helpers.py
View File

@ -378,20 +378,15 @@ class ProbackupTest(object):
if is_test_result_ok(self):
for node in self.nodes_to_cleanup:
node.cleanup()
# we do clear refs to nodes to gather them by gc inside self.del_test_dir()
self.nodes_to_cleanup.clear()
self.del_test_dir(self.module_name, self.fname)
if isinstance(self, unittest.TestCase):
module_name = self.id().split('.')[1]
fname = self.id().split('.')[3]
self.del_test_dir(module_name, fname)
else:
for node in self.nodes_to_cleanup:
# TODO VERIFY do we want to remain failed test's db data for further investigations?
# TODO VERIFY or just to leave logs only without node/data?
# node._try_shutdown(max_attempts=1)
node.cleanup()
self.nodes_to_cleanup.clear()
# TODO make decorator with proper stop() vs cleanup()
node._try_shutdown(max_attempts=1)
# node.cleanup()
self.nodes_to_cleanup.clear()
@property
def pg_config_version(self):
@ -1705,25 +1700,9 @@ class ProbackupTest(object):
def get_bin_path(self, binary):
return testgres.get_bin_path(binary)
def clean_all(self):
# pre gc.collect() all dropped nodes
for o in gc.get_referrers(testgres.PostgresNode):
if o.__class__ is testgres.PostgresNode:
# removing node from slow_start enclosure
# after this the node is collectable by gc
o.slow_start = None
gc.collect()
# only when there are unhandled nodes left we do the cleanup for them
for o in gc.get_referrers(testgres.PostgresNode):
if o.__class__ is testgres.PostgresNode:
o.cleanup()
def del_test_dir(self, module_name, fname):
""" Del testdir and optimistically try to del module dir"""
self.clean_all()
shutil.rmtree(
os.path.join(
self.tmp_path,