[PBCKP-304] removed direct calls to ProbackupTest.del_test_dir() from tests

Author: Ivan Lazarev

tests/archive.py

@@ -78,7 +78,6 @@ def test_pgpro434_2(self):
             )
 
         if self.get_version(node) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because pg_control_checkpoint() is not supported in PG 9.5')
 
@@ -681,7 +680,6 @@ def test_replica_archive(self):
                 'max_wal_size': '32MB'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -808,7 +806,6 @@ def test_master_and_replica_parallel_archiving(self):
             )
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -899,7 +896,6 @@ def test_basic_master_and_replica_concurrent_archiving(self):
                 'archive_timeout': '10s'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1221,7 +1217,6 @@ def test_archive_catalog(self):
                 'checkpoint_timeout': '30s'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -2083,7 +2078,6 @@ def test_archive_pg_receivexlog_partial_handling(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(node) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -2284,7 +2278,6 @@ def test_archive_get_batching_sanity(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(node) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 

tests/backup.py

@@ -2253,7 +2253,6 @@ def test_backup_with_less_privileges_role(self):
                 datname='backupdb', options=['--stream', '-U', 'backup'])
 
         if self.get_version(node) < 90600:
-            self.del_test_dir(self.module_name, self.fname)
             return
 
         # Restore as replica

tests/catchup.py

@@ -53,7 +53,6 @@ def test_basic_full_catchup(self):
         # Cleanup
         dst_pg.stop()
         #self.assertEqual(1, 0, 'Stop test')
-        self.del_test_dir(self.module_name, self.fname)
 
     def test_full_catchup_with_tablespace(self):
         """
@@ -1533,7 +1532,6 @@ def test_dry_run_catchup_ptrack(self):
 
         # Cleanup
         src_pg.stop()
-        self.del_test_dir(self.module_name, self.fname)
 
     def test_dry_run_catchup_delta(self):
         """

tests/compatibility.py

@@ -86,9 +86,6 @@ def test_catchup_with_different_remote_major_pg(self):
             options=['-d', 'postgres', '-p', str(src_pg.port), '--stream', '--remote-path=' + pgprobackup_ssh_agent_path]
             )
 
-        # Clean after yourself
-        self.del_test_dir(self.module_name, self.fname)
-
     # @unittest.expectedFailure
     # @unittest.skip("skip")
     def test_backward_compatibility_page(self):

tests/incr_restore.py

@@ -1389,9 +1389,6 @@ def test_incr_checksum_restore_backward(self):
         pgdata_restored = self.pgdata_content(node.data_dir)
         self.compare_pgdata(delta_pgdata, pgdata_restored)
 
-        # Clean after yourself
-        self.del_test_dir(self.module_name, self.fname)
-
     # @unittest.skip("skip")
     def test_make_replica_via_incr_checksum_restore(self):
         """
@@ -1403,7 +1400,6 @@ def test_make_replica_via_incr_checksum_restore(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1472,7 +1468,6 @@ def test_make_replica_via_incr_lsn_restore(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 

tests/merge.py

@@ -754,9 +754,6 @@ def test_merge_delta_truncate(self):
 
         self.assertEqual(result1, result2)
 
-        # Clean after yourself
-        self.del_test_dir(self.module_name, self.fname)
-
     def test_merge_ptrack_truncate(self):
         """
         make node, create table, take full backup,
@@ -1401,8 +1398,6 @@ def test_crash_after_opening_backup_control_1(self):
         self.assertEqual(
             'MERGING', self.show_pb(backup_dir, 'node')[1]['status'])
 
-        self.del_test_dir(self.module_name, self.fname)
-
     # @unittest.skip("skip")
     def test_crash_after_opening_backup_control_2(self):
         """
@@ -2657,8 +2652,6 @@ def test_missing_non_data_file(self):
         self.assertEqual(
             'MERGING', self.show_pb(backup_dir, 'node')[1]['status'])
 
-        self.del_test_dir(self.module_name, self.fname)
-
     # @unittest.skip("skip")
     def test_merge_remote_mode(self):
         """

tests/pgpro560.py

@@ -45,10 +45,8 @@ def test_pgpro560_control_file_loss(self):
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
-        # Clean after yourself
         # Return this file to avoid Postger fail
         os.rename(os.path.join(node.base_dir, 'data', 'global', 'pg_control_copy'), file)
-        self.del_test_dir(self.module_name, self.fname)
 
     def test_pgpro560_systemid_mismatch(self):
         """

tests/ptrack.py

@@ -3096,9 +3096,6 @@ def test_basic_ptrack_truncate_replica(self):
             'postgres',
             'select 1')
 
-        # Clean after yourself
-        self.del_test_dir(self.module_name, self.fname)
-
     # @unittest.skip("skip")
     # @unittest.expectedFailure
     def test_ptrack_vacuum(self):

tests/replica.py

@@ -26,7 +26,6 @@ def test_replica_switchover(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(node1) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -229,7 +228,6 @@ def test_replica_archive_page_backup(self):
                 'max_wal_size': '32MB'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -367,7 +365,6 @@ def test_basic_make_replica_via_restore(self):
                 'archive_timeout': '10s'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -421,7 +418,6 @@ def test_take_backup_from_delayed_replica(self):
             pg_options={'archive_timeout': '10s'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -530,7 +526,6 @@ def test_replica_promote(self):
                 'max_wal_size': '32MB'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -617,7 +612,6 @@ def test_replica_stop_lsn_null_offset(self):
                 'wal_level': 'replica'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -700,7 +694,6 @@ def test_replica_stop_lsn_null_offset_next_record(self):
                 'wal_level': 'replica'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -799,7 +792,6 @@ def test_archive_replica_null_offset(self):
                 'wal_level': 'replica'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -879,7 +871,6 @@ def test_archive_replica_not_null_offset(self):
                 'wal_level': 'replica'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -964,7 +955,6 @@ def test_replica_toast(self):
                 'shared_buffers': '128MB'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1064,7 +1054,6 @@ def test_start_stop_lsn_in_the_same_segno(self):
                 'shared_buffers': '128MB'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1138,7 +1127,6 @@ def test_replica_promote_1(self):
                 'wal_level': 'replica'})
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1257,7 +1245,6 @@ def test_replica_promote_archive_delta(self):
                 'archive_timeout': '30s'})
 
         if self.get_version(node1) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1378,7 +1365,6 @@ def test_replica_promote_archive_page(self):
                 'archive_timeout': '30s'})
 
         if self.get_version(node1) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 
@@ -1496,7 +1482,6 @@ def test_parent_choosing(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(master) < self.version_to_num('9.6.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return unittest.skip(
                 'Skipped because backup from replica is not supported in PG 9.5')
 

tests/restore.py

@@ -334,7 +334,6 @@ def test_restore_to_lsn_inclusive(self):
             initdb_params=['--data-checksums'])
 
         if self.get_version(node) < self.version_to_num('10.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return
 
         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):
             initdb_params=['--data-checksums'])
 
         if self.get_version(node) < self.version_to_num('10.0'):
-            self.del_test_dir(self.module_name, self.fname)
             return
 
         backup_dir = os.path.join(self.tmp_path, self.module_name, self.fname, 'backup')