Skip to content

Commit ebf7a0e

Browse files
alubennikovaalubennikova
committed
Merge branch 'PBCKP-114'
2 parents 5b9fdb7 + 302f231 commit ebf7a0e

File tree

13 files changed

+47
-52
lines changed

13 files changed

+47
-52
lines changed

‎tests/archive.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ def test_basic_master_and_replica_concurrent_archiving(self):
981981
self.backup_node(backup_dir, 'master', replica)
982982

983983
# Clean after yourself
984-
self.del_test_dir(module_name, fname, nodes=[master, replica])
984+
self.del_test_dir(module_name, fname)
985985

986986
# @unittest.expectedFailure
987987
# @unittest.skip("skip")
@@ -2016,8 +2016,7 @@ def test_archive_pg_receivexlog_partial_handling(self):
20162016

20172017
# Clean after yourself
20182018
pg_receivexlog.kill()
2019-
self.del_test_dir(
2020-
module_name, fname, [node, replica, node_restored])
2019+
self.del_test_dir(module_name, fname)
20212020

20222021
@unittest.skip("skip")
20232022
def test_multi_timeline_recovery_prefetching(self):

‎tests/backup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ def test_basic_tablespace_handling(self):
10651065
self.compare_pgdata(pgdata, pgdata_restored)
10661066

10671067
# Clean after yourself
1068-
self.del_test_dir(module_name, fname, nodes=[node])
1068+
self.del_test_dir(module_name, fname)
10691069

10701070
# @unittest.skip("skip")
10711071
def test_tablespace_handling_1(self):
@@ -1599,7 +1599,7 @@ def test_basic_temp_slot_for_stream_backup(self):
15991599
options=['--stream', '--slot=slot_1', '--temp-slot'])
16001600

16011601
# Clean after yourself
1602-
self.del_test_dir(module_name, fname, [node])
1602+
self.del_test_dir(module_name, fname)
16031603

16041604
# @unittest.skip("skip")
16051605
def test_backup_concurrent_drop_table(self):
@@ -1645,7 +1645,7 @@ def test_backup_concurrent_drop_table(self):
16451645
self.assertEqual(show_backup['status'], "OK")
16461646

16471647
# Clean after yourself
1648-
self.del_test_dir(module_name, fname, nodes=[node])
1648+
self.del_test_dir(module_name, fname)
16491649

16501650
# @unittest.skip("skip")
16511651
def test_pg_11_adjusted_wal_segment_size(self):
@@ -1930,7 +1930,7 @@ def test_basic_missing_file_permissions(self):
19301930
os.chmod(full_path, 700)
19311931

19321932
# Clean after yourself
1933-
self.del_test_dir(module_name, fname, [node])
1933+
self.del_test_dir(module_name, fname)
19341934

19351935
# @unittest.skip("skip")
19361936
def test_basic_missing_dir_permissions(self):
@@ -1973,7 +1973,7 @@ def test_basic_missing_dir_permissions(self):
19731973
os.rmdir(full_path)
19741974

19751975
# Clean after yourself
1976-
self.del_test_dir(module_name, fname, [node])
1976+
self.del_test_dir(module_name, fname)
19771977

19781978
# @unittest.skip("skip")
19791979
def test_backup_with_least_privileges_role(self):

‎tests/checkdb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def test_basic_checkdb_amcheck_only_sanity(self):
349349
log_file_content)
350350

351351
# Clean after yourself
352-
self.del_test_dir(module_name, fname, [node])
352+
self.del_test_dir(module_name, fname)
353353

354354
# @unittest.skip("skip")
355355
def test_checkdb_block_validation_sanity(self):

‎tests/compression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def test_basic_compression_stream_zlib(self):
117117
self.assertEqual(delta_result, delta_result_new)
118118

119119
# Clean after yourself
120-
self.del_test_dir(module_name, fname, [node])
120+
self.del_test_dir(module_name, fname)
121121

122122
def test_compression_archive_zlib(self):
123123
"""

‎tests/delta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_basic_delta_vacuum_truncate(self):
8080
node_restored.slow_start()
8181

8282
# Clean after yourself
83-
self.del_test_dir(module_name, fname, [node, node_restored])
83+
self.del_test_dir(module_name, fname)
8484

8585
# @unittest.skip("skip")
8686
def test_delta_vacuum_truncate_1(self):

‎tests/helpers/ptrack_helpers.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# you need os for unittest to work
22
import os
3+
import gc
34
from sys import exit, argv, version_info
45
import subprocess
56
import shutil
@@ -402,7 +403,6 @@ def make_simple_node(
402403
if node.major_version >= 13:
403404
self.set_auto_conf(
404405
node, {}, 'postgresql.conf', ['wal_keep_segments'])
405-
406406
return node
407407

408408
def create_tblspace_in_node(self, node, tblspc_name, tblspc_path=None, cfs=False):
@@ -1514,15 +1514,15 @@ def get_version(self, node):
15141514
def get_bin_path(self, binary):
15151515
return testgres.get_bin_path(binary)
15161516

1517-
def del_test_dir(self, module_name, fname, nodes=[]):
1517+
def clean_all(self):
1518+
for o in gc.get_referrers(testgres.PostgresNode):
1519+
if o.__class__ is testgres.PostgresNode:
1520+
o.cleanup()
1521+
1522+
def del_test_dir(self, module_name, fname):
15181523
""" Del testdir and optimistically try to del module dir"""
1519-
try:
1520-
testgres.clean_all()
1521-
except:
1522-
pass
15231524

1524-
for node in nodes:
1525-
node.stop()
1525+
self.clean_all()
15261526

15271527
shutil.rmtree(
15281528
os.path.join(
@@ -1532,10 +1532,6 @@ def del_test_dir(self, module_name, fname, nodes=[]):
15321532
),
15331533
ignore_errors=True
15341534
)
1535-
try:
1536-
os.rmdir(os.path.join(self.tmp_path, module_name))
1537-
except:
1538-
pass
15391535

15401536
def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):
15411537
""" return dict with directory content. "

‎tests/incr_restore.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ def test_basic_incr_restore_sanity(self):
720720
repr(e.message), self.cmd))
721721

722722
# Clean after yourself
723-
self.del_test_dir(module_name, fname, [node])
723+
self.del_test_dir(module_name, fname)
724724

725725
# @unittest.skip("skip")
726726
def test_incr_checksum_restore(self):
@@ -809,7 +809,7 @@ def test_incr_checksum_restore(self):
809809
self.compare_pgdata(pgdata, pgdata_restored)
810810

811811
# Clean after yourself
812-
self.del_test_dir(module_name, fname, [node, node_1])
812+
self.del_test_dir(module_name, fname)
813813

814814

815815
# @unittest.skip("skip")
@@ -898,7 +898,7 @@ def test_incr_lsn_restore(self):
898898
self.compare_pgdata(pgdata, pgdata_restored)
899899

900900
# Clean after yourself
901-
self.del_test_dir(module_name, fname, [node, node_1])
901+
self.del_test_dir(module_name, fname)
902902

903903
# @unittest.skip("skip")
904904
def test_incr_lsn_sanity(self):
@@ -967,7 +967,7 @@ def test_incr_lsn_sanity(self):
967967
repr(e.message), self.cmd))
968968

969969
# Clean after yourself
970-
self.del_test_dir(module_name, fname, [node_1])
970+
self.del_test_dir(module_name, fname)
971971

972972
# @unittest.skip("skip")
973973
def test_incr_checksum_sanity(self):
@@ -1026,7 +1026,7 @@ def test_incr_checksum_sanity(self):
10261026
self.compare_pgdata(pgdata, pgdata_restored)
10271027

10281028
# Clean after yourself
1029-
self.del_test_dir(module_name, fname, [node_1])
1029+
self.del_test_dir(module_name, fname)
10301030

10311031

10321032
# @unittest.skip("skip")
@@ -1561,7 +1561,7 @@ def test_make_replica_via_incr_checksum_restore(self):
15611561
pgbench.wait()
15621562

15631563
# Clean after yourself
1564-
self.del_test_dir(module_name, fname, [new_master, old_master])
1564+
self.del_test_dir(module_name, fname)
15651565

15661566
# @unittest.skip("skip")
15671567
def test_make_replica_via_incr_lsn_restore(self):
@@ -1634,7 +1634,7 @@ def test_make_replica_via_incr_lsn_restore(self):
16341634
pgbench.wait()
16351635

16361636
# Clean after yourself
1637-
self.del_test_dir(module_name, fname, [new_master, old_master])
1637+
self.del_test_dir(module_name, fname)
16381638

16391639
# @unittest.skip("skip")
16401640
# @unittest.expectedFailure
@@ -1878,7 +1878,7 @@ def test_incr_lsn_long_xact_2(self):
18781878
'1')
18791879

18801880
# Clean after yourself
1881-
self.del_test_dir(module_name, fname, [node])
1881+
self.del_test_dir(module_name, fname)
18821882

18831883
# @unittest.skip("skip")
18841884
# @unittest.expectedFailure
@@ -2137,7 +2137,7 @@ def test_incremental_partial_restore_exclude_checksum(self):
21372137
self.assertNotIn('PANIC', output)
21382138

21392139
# Clean after yourself
2140-
self.del_test_dir(module_name, fname, [node, node2])
2140+
self.del_test_dir(module_name, fname)
21412141

21422142
def test_incremental_partial_restore_exclude_lsn(self):
21432143
""""""
@@ -2247,7 +2247,7 @@ def test_incremental_partial_restore_exclude_lsn(self):
22472247
self.assertNotIn('PANIC', output)
22482248

22492249
# Clean after yourself
2250-
self.del_test_dir(module_name, fname, [node2])
2250+
self.del_test_dir(module_name, fname)
22512251

22522252
def test_incremental_partial_restore_exclude_tablespace_checksum(self):
22532253
""""""
@@ -2391,7 +2391,7 @@ def test_incremental_partial_restore_exclude_tablespace_checksum(self):
23912391
self.assertNotIn('PANIC', output)
23922392

23932393
# Clean after yourself
2394-
self.del_test_dir(module_name, fname, [node2])
2394+
self.del_test_dir(module_name, fname)
23952395

23962396
def test_incremental_pg_filenode_map(self):
23972397
"""

‎tests/merge.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def test_basic_merge_full_page(self):
101101
self.assertEqual(count1, count2)
102102

103103
# Clean after yourself
104-
self.del_test_dir(module_name, fname, [node])
104+
self.del_test_dir(module_name, fname)
105105

106106
def test_merge_compressed_backups(self):
107107
"""
@@ -2245,7 +2245,7 @@ def test_merge_multiple_descendants(self):
22452245
repr(e.message), self.cmd))
22462246

22472247
# Clean after yourself
2248-
self.del_test_dir(module_name, fname, [node])
2248+
self.del_test_dir(module_name, fname)
22492249

22502250
# @unittest.skip("skip")
22512251
def test_smart_merge(self):
@@ -2305,7 +2305,7 @@ def test_smart_merge(self):
23052305
logfile_content = f.read()
23062306

23072307
# Clean after yourself
2308-
self.del_test_dir(module_name, fname, [node])
2308+
self.del_test_dir(module_name, fname)
23092309

23102310
def test_idempotent_merge(self):
23112311
"""
@@ -2380,7 +2380,7 @@ def test_idempotent_merge(self):
23802380
self.assertEqual(
23812381
page_id_2, self.show_pb(backup_dir, 'node')[0]['id'])
23822382

2383-
self.del_test_dir(module_name, fname, [node])
2383+
self.del_test_dir(module_name, fname)
23842384

23852385
def test_merge_correct_inheritance(self):
23862386
"""
@@ -2435,7 +2435,7 @@ def test_merge_correct_inheritance(self):
24352435
page_meta['expire-time'],
24362436
self.show_pb(backup_dir, 'node', page_id)['expire-time'])
24372437

2438-
self.del_test_dir(module_name, fname, [node])
2438+
self.del_test_dir(module_name, fname)
24392439

24402440
def test_merge_correct_inheritance_1(self):
24412441
"""
@@ -2485,7 +2485,7 @@ def test_merge_correct_inheritance_1(self):
24852485
'expire-time',
24862486
self.show_pb(backup_dir, 'node', page_id))
24872487

2488-
self.del_test_dir(module_name, fname, [node])
2488+
self.del_test_dir(module_name, fname)
24892489

24902490
# @unittest.skip("skip")
24912491
# @unittest.expectedFailure
@@ -2604,7 +2604,7 @@ def test_multi_timeline_merge(self):
26042604
'-d', 'postgres', '-p', str(node_restored.port)])
26052605

26062606
# Clean after yourself
2607-
self.del_test_dir(module_name, fname, [node, node_restored])
2607+
self.del_test_dir(module_name, fname)
26082608

26092609
# @unittest.skip("skip")
26102610
# @unittest.expectedFailure

‎tests/page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def test_basic_page_vacuum_truncate(self):
100100
self.assertEqual(result1, result2)
101101

102102
# Clean after yourself
103-
self.del_test_dir(module_name, fname, [node, node_restored])
103+
self.del_test_dir(module_name, fname)
104104

105105
# @unittest.skip("skip")
106106
def test_page_vacuum_truncate_1(self):

‎tests/ptrack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3148,7 +3148,7 @@ def test_basic_ptrack_truncate_replica(self):
31483148
'select 1')
31493149

31503150
# Clean after yourself
3151-
self.del_test_dir(module_name, fname, [master, replica, node])
3151+
self.del_test_dir(module_name, fname)
31523152

31533153
# @unittest.skip("skip")
31543154
# @unittest.expectedFailure

0 commit comments

Comments
 (0)