8000 [PBCKP-304] removed direct calls to ProbackupTest.del_test_dir() from… · postgrespro/pg_probackup@a2c1e6d · GitHub
[go: up one dir, main page]
Skip to content

Commit a2c1e6d

Browse files
author
Ivan Lazarev
committed
[PBCKP-304] removed direct calls to ProbackupTest.del_test_dir() from tests
1 parent 39e06f5 commit a2c1e6d

File tree

11 files changed

+0
-49
lines changed

11 files changed

+0
-49
lines changed

‎tests/archive.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ def tes 10000 t_pgpro434_2(self):
7878
)
7979

8080
if self.get_version(node) < self.version_to_num('9.6.0'):
81-
self.del_test_dir(self.module_name, self.fname)
8281
return unittest.skip(
8382
'Skipped because pg_control_checkpoint() is not supported in PG 9.5')
8483

@@ -681,7 +680,6 @@ def test_replica_archive(self):
681680
'max_wal_size': '32MB'})
682681

683682
if self.get_version(master) < self.version_to_num('9.6.0'):
684-
self.del_test_dir(self.module_name, self.fname)
685683
return unittest.skip(
686684
'Skipped because backup from replica is not supported in PG 9.5')
687685

@@ -808,7 +806,6 @@ def test_master_and_replica_parallel_archiving(self):
808806
)
809807

810808
if self.get_version(master) < self.version_to_num('9.6.0'):
811-
self.del_test_dir(self.module_name, self.fname)
812809
return unittest.skip(
813810
'Skipped because backup from replica is not supported in PG 9.5')
814811

@@ -899,7 +896,6 @@ def test_basic_master_and_replica_concurrent_archiving(self):
899896
'archive_timeout': '10s'})
900897

901898
if self.get_version(master) < self.version_to_num('9.6.0'):
902-
self.del_test_dir(self.module_name, self.fname)
903899
return unittest.skip(
904900
'Skipped because backup from replica is not supported in PG 9.5')
905901

@@ -1221,7 +1217,6 @@ def test_archive_catalog(self):
12211217
'checkpoint_timeout': '30s'})
12221218

12231219
if self.get_version(master) < self.version_to_num('9.6.0'):
1224-
self.del_test_dir(self.module_name, self.fname)
12251220
return unittest.skip(
12261221
'Skipped because backup from replica is not supported in PG 9.5')
12271222

@@ -2083,7 +2078,6 @@ def test_archive_pg_receivexlog_partial_handling(self):
20832078
initdb_params=['--data-checksums'])
20842079

20852080
if self.get_version(node) < self.version_to_num('9.6.0'):
2086-
self.del_test_dir(self.module_name, self.fname)
20872081
return unittest.skip(
20882082
'Skipped because backup from replica is not supported in PG 9.5')
20892083

@@ -2284,7 +2278,6 @@ def test_archive_get_batching_sanity(self):
22842278
initdb_params=['--data-checksums'])
22852279

22862280
if self.get_version(node) < self.version_to_num('9.6.0'):
2287-
self.del_test_dir(self.module_name, self.fname)
22882281
return unittest.skip(
22892282
'Skipped because backup from replica is not supported in PG 9.5')
22902283

‎tests/backup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2253,7 +2253,6 @@ def test_backup_with_less_privileges_role(self):
22532253
datname='backupdb', options=['--stream', '-U', 'backup'])
22542254

22552255
if self.get_version(node) < 90600:
2256-
self.del_test_dir(self.module_name, self.fname)
22572256
return
22582257

22592258
# Restore as replica

‎tests/catchup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def test_basic_full_catchup(self):
5353
# Cleanup
5454
dst_pg.stop()
5555
#self.assertEqual(1, 0, 'Stop test')
56-
self.del_test_dir(self.module_name, self.fname)
5756

5857
def test_full_catchup_with_tablespace(self):
5958
"""
@@ -1533,7 +1532,6 @@ def test_dry_run_catchup_ptrack(self):
15331532

15341533
# Cleanup
15351534
src_pg.stop()
1536-
self.del_test_dir(self.module_name, self.fname)
15371535

15381536
def test_dry_run_catchup_delta(self):
15391537
"""

‎tests/compatibility.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ def test_catchup_with_different_remote_major_pg(self):
8686
options=['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--remote-path=' + pgprobackup_ssh_agent_path]
8787
)
8888

89-
# Clean after yourself
90-
self.del_test_dir(self.module_name, self.fname)
91-
9289
# @unittest.expectedFailure
9390
# @unittest.skip("skip")
9491
def test_backward_compatibility_page(self):

‎tests/incr_restore.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,9 +1389,6 @@ def test_incr_checksum_restore_backward(self):
13891389
pgdata_restored = self.pgdata_content(node.data_dir)
13901390
self.compare_pgdata(delta_pgdata, pgdata_restored)
13911391

1392-
# Clean after yourself
1393-
self.del_test_dir(self.module_name, self.fname)
1394-
13951392
# @unittest.skip("skip")
13961393
def test_make_replica_via_incr_checksum_restore(self):
13971394
"""
@@ -1403,7 +1400,6 @@ def test_make_replica_via_incr_checksum_restore(self):
14031400
initdb_params=['--data-checksums'])
14041401

14051402
if self.get_version(master) < self.version_to_num('9.6.0'):
1406-
self.del_test_dir(self.module_name, self.fname)
14071403
return unittest.skip(
14081404
'Skipped because backup from replica is not supported in PG 9.5')
14091405

@@ -1472,7 +1468,6 @@ def test_make_replica_via_incr_lsn_restore(self):
14721468
initdb_params=['--data-checksums'])
14731469

14741470
if self.get_version(master) < self.version_to_num('9.6.0'):
1475-
self.del_test_dir(self.module_name, self.fname)
14761471
return unittest.skip(
14771472
'Skipped because backup from replica is not supported in PG 9.5')
14781473

‎tests/merge.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -754,9 +754,6 @@ def test_merge_delta_truncate(self):
754754

755755
self.assertEqual(result1, result2)
756756

757-
# Clean after yourself
758-
self.del_test_dir(self.module_name, self.fname)
759-
760757
def test_merge_ptrack_truncate(self):
761758
"""
762759
make node, create table, take full backup,
@@ -1401,8 +1398,6 @@ def test_crash_after_opening_backup_control_1(self):
14011398
self.assertEqual(
14021399
'MERGING', self.show_pb(backup_dir, 'node')[1]['status'])
14031400

1404-
self.del_test_dir(self.module_name, self.fname)
1405-
14061401
# @unittest.skip("skip")
14071402
def test_crash_after_opening_backup_control_2(self):
14081403
"""
@@ -2657,8 +2652,6 @@ def test_missing_non_data_file(self):
26572652
self.assertEqual(
26582653
'MERGING', self.show_pb(backup_dir, 'node')[1]['status'])
26592654

2660-
self.del_test_dir(self.module_name, self.fname)
2661-
26622655
# @unittest.skip("skip")
26632656
def test_merge_remote_mode(self):
26642657
"""

‎tests/pgpro560.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ def test_pgpro560_control_file_loss(self):
4545
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
4646
repr(e.message), self.cmd))
4747

48-
# Clean after yourself
4948
# Return this file to avoid Postger fail
5049
os.rename(os.path.join(node.base_dir, 'data', 'global', 'pg_control_copy'), file)
51-
self.del_test_dir(self.module_name, self.fname)
5250

5351
def test_pgpro560_systemid_mismatch(self):
5452
"""

‎tests/ptrack.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3096,9 +3096,6 @@ def test_basic_ptrack_truncate_replica(self):
30963096
'postgres',
30973097
'select 1')
30983098

3099-
# Clean after yourself
3100-
self.del_test_dir(self.module_name, self.fname)
3101-
31023099
# @unittest.skip("skip")
31033100
# @unittest.expectedFailure
31043101
def test_ptrack_vacuum(self):

‎tests/replica.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def test_replica_switchover(self):
2626
initdb_params=['--data-checksums'])
2727

2828
if self.get_version(node1) < self.version_to_num('9.6.0'):
29-
self.del_test_dir(self.module_name, self.fname)
3029
return unittest.skip(
3130
'Skipped because backup from replica is not supported in PG 9.5')
3231

@@ -229,7 +228,6 @@ def test_replica_archive_page_backup(self):
229228
'max_wal_size': '32MB'})
230229

231230
if self.get_version(master) < self.version_to_num('9.6.0'):
232-
self.del_test_dir(self.module_name, self.fname)
233231
return unittest.skip(
234232
'Skipped because backup from replica is not supported in PG 9.5')
235233

@@ -367,7 +365,6 @@ def test_basic_make_replica_via_restore(self):
367365
'archive_timeout': '10s'})
368366

369367
if self.get_version(master) < self.version_to_num('9.6.0'):
370-
self.del_test_dir(self.module_name, self.fname)
371368
return unittest.skip(
372369
'Skipped because backup from replica is not supported in PG 9.5')
373370

@@ -421,7 +418,6 @@ def test_take_backup_from_delayed_replica(self):
421418
pg_options={'archive_timeout': '10s'})
422419

423420
if self.get_version(master) < self.version_to_num('9.6.0'):
424-
self.del_test_dir(self.module_name, self.fname)
425421
return unittest.skip(
426422
'Skipped because backup from replica is not supported in PG 9.5')
427423

@@ -530,7 +526,6 @@ def test_replica_promote(self):
530526
'max_wal_size': '32MB'})
531527

532528
if self.get_version(master) < self.version_to_num('9.6.0'):
533-
self.del_test_dir(self.module_name, self.fname)
534529
return unittest.skip(
535530
'Skipped because backup from replica is not supported in PG 9.5')
536531

@@ -617,7 +612,6 @@ def test_replica_stop_lsn_null_offset(self):
617612
'wal_level': 'replica'})
618613

619614
if self.get_version(master) < self.version_to_num('9.6.0'):
620-
self.del_test_dir(self.module_name, self.fname)
621615
return unittest.skip(
622616
'Skipped because backup from replica is not supported in PG 9.5')
623617

@@ -700,7 +694,6 @@ def test_replica_stop_lsn_null_offset_next_record(self):
700694
'wal_level': 'replica'})
701695

702696
if self.get_version(master) < self.version_to_num('9.6.0'):
703-
self.del_test_dir(self.module_name, self.fname)
704697
return unittest.skip(
705698
'Skipped because backup from replica is not supported in PG 9.5')
706699

@@ -799,7 +792,6 @@ def test_archive_replica_null_offset(self):
799792
'wal_level': 'replica'})
800793

801794
if self.get_version(master) < self.version_to_num('9.6.0'):
802-
self.del_test_dir(self.module_name, self.fname)
803795
return unittest.skip(
804796
'Skipped because backup from replica is not supported in PG 9.5')
805797

@@ -879,7 +871,6 @@ def test_archive_replica_not_null_offset(self):
879871
'wal_level': 'replica'})
880872

881873
if self.get_version(master) < self.version_to_num('9.6.0'):
882-
self.del_test_dir(self.module_name, self.fname)
883874
return unittest.skip(
884875
'Skipped because backup from replica is not supported in PG 9.5')
885876

@@ -964,7 +955,6 @@ def test_replica_toast(self):
964955
'shared_buffers': '128MB'})
965956

966957
if self.get_version(master) < self.version_to_num('9.6.0'):
967-
self.del_test_dir(self.module_name, self.fname)
968958
return unittest.skip(
969959
'Skipped because backup from replica is not supported in PG 9.5')
970960

@@ -1064,7 +1054,6 @@ def test_start_stop_lsn_in_the_same_segno(self):
10641054
'shared_buffers': '128MB'})
10651055

10661056
if self.get_version(master) < self.version_to_num('9.6.0'):
1067-
self.del_test_dir(self.module_name, self.fname)
10681057
return unittest.skip(
10691058
'Skipped because backup from replica is not supported in PG 9.5')
10701059

@@ -1138,7 +1127,6 @@ def test_replica_promote_1(self):
11381127
'wal_level': 'replica'})
11391128

11401129
if self.get_version(master) < self.version_to_num('9.6.0'):
1141-
self.del_test_dir(self.module_name, self.fname)
11421130
return unittest.skip(
11431131
'Skipped because backup from replica is not supported in PG 9.5')
11441132

@@ -1257,7 +1245,6 @@ def test_replica_promote_archive_delta(self):
12571245
'archive_timeout': '30s'})
12581246

12591247
if self.get_version(node1) < self.version_to_num('9.6.0'):
1260-
self.del_test_dir(self.module_name, self.fname)
12611248
return unittest.skip(
12621249
'Skipped because backup from replica is not supported in PG 9.5')
12631250

@@ -1378,7 +1365,6 @@ def test_replica_promote_archive_page(self):
13781365
'archive_timeout': '30s'})
13791366

13801367
if self.get_version(node1) < self.version_to_num('9.6.0'):
1381-
self.del_test_dir(self.module_name, self.fname)
13821368
return unittest.skip(
13831369
'Skipped because backup from replica is not supported in PG 9.5')
13841370

@@ -1496,7 +1482,6 @@ def test_parent_choosing(self):
14961482
initdb_params=['--data-checksums'])
14971483

14981484
if self.get_version(master) < self.version_to_num('9.6.0'):
1499-
self.del_test_dir(self.module_name, self.fname)
15001485
return unittest.skip(
15011486
'Skipped because backup from replica is not supported in PG 9.5')
15021487

‎tests/restore.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ def test_restore_to_lsn_inclusive(self):
334334
initdb_params=['--data-checksums'])
335335

336336
if self.get_version(node) < self.version_to_num('10.0'):
337-
self.del_test_dir(self.module_name, self.fname)
338337
return
339338

340339
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')
@@ -401,7 +400,6 @@ def test_restore_to_lsn_not_inclusive(self):
401400
initdb_params=['--data-checksums'])
402401

403402
if self.get_version(node) < self.version_to_num('10.0'):
404-
self.del_test_dir(self.module_name, self.fname)
405403
return
406404

407405
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')

‎tests/retention.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,6 @@ def test_retention_redundancy_overlapping_chains(self):
15381538
initdb_params=['--data-checksums'])
15391539

15401540
if self.get_version(node) < 90600:
1541-
self.del_test_dir(self.module_name, self.fname)
15421541
return unittest.skip('Skipped because ptrack support is disabled')
15431542

15441543
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')
@@ -1584,7 +1583,6 @@ def test_retention_redundancy_overlapping_chains_1(self):
15841583
initdb_params=['--data-checksums'])
15851584

15861585
if self.get_version(node) < 90600:
1587-
self.del_test_dir(self.module_name, self.fname)
15881586
return unittest.skip('Skipped because ptrack support is disabled')
15891587

15901588
backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')

0 commit comments

Comments
 (0)
0