Skip to content

Commit b11bd8e

Browse files
author
a.kozhemyakin
committed
fix: clean node data after test
1 parent 673b11b commit b11bd8e

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

tests/helpers/ptrack_helpers.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ def slow_start(self, replica=False):
145145
class ProbackupTest(object):
146146
# Class attributes
147147
enterprise = is_enterprise()
148+
nodes = []
148149

149150
def __init__(self, *args, **kwargs):
150151
super(ProbackupTest, self).__init__(*args, **kwargs)
@@ -402,7 +403,7 @@ def make_simple_node(
402403
if node.major_version >= 13:
403404
self.set_auto_conf(
404405
node, {}, 'postgresql.conf', ['wal_keep_segments'])
405-
406+
self.nodes.append(node)
406407
return node
407408

408409
def create_tblspace_in_node(self, node, tblspc_name, tblspc_path=None, cfs=False):
@@ -1521,8 +1522,17 @@ def del_test_dir(self, module_name, fname, nodes=[]):
15211522
except:
15221523
pass
15231524

1524-
for node in nodes:
1525-
node.stop()
1525+
try:
1526+
if not nodes:
1527+
for node in list(self.nodes):
1528+
node.stop()
1529+
self.nodes.remove(node)
1530+
else:
1531+
for node in list(nodes):
1532+
node.stop()
1533+
self.nodes.remove(node)
1534+
except:
1535+
pass
15261536

15271537
shutil.rmtree(
15281538
os.path.join(
@@ -1533,7 +1543,7 @@ def del_test_dir(self, module_name, fname, nodes=[]):
15331543
ignore_errors=True
15341544
)
15351545
try:
1536-
os.rmdir(os.path.join(self.tmp_path, module_name))
1546+
shutil.rmtree(os.path.join(self.tmp_path, module_name), ignore_errors=True)
15371547
except:
15381548
pass
15391549

0 commit comments

Comments
 (0)