From dd8c23c9b12e7831ec3669b2b52e2f4582d76a62 Mon Sep 17 00:00:00 2001 From: "a.kozhemyakin" Date: Thu, 18 Feb 2021 05:13:11 +0000 Subject: [PATCH] delete nodes in del_test_dir --- tests/archive.py | 5 ++--- tests/backup.py | 10 +++++----- tests/checkdb.py | 2 +- tests/compression.py | 2 +- tests/delta.py | 2 +- tests/helpers/ptrack_helpers.py | 2 +- tests/incr_restore.py | 22 +++++++++++----------- tests/merge.py | 14 +++++++------- tests/page.py | 2 +- tests/ptrack.py | 2 +- tests/replica.py | 2 +- tests/retention.py | 6 +++--- tests/validate.py | 8 ++++---- 13 files changed, 39 insertions(+), 40 deletions(-) diff --git a/tests/archive.py b/tests/archive.py index 05675065..e76ca5d3 100644 --- a/tests/archive.py +++ b/tests/archive.py @@ -981,7 +981,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase): self.backup_node(backup_dir, 'master', replica) # Clean after yourself - self.del_test_dir(module_name, fname, nodes=[master, replica]) + self.del_test_dir(module_name, fname) # @unittest.expectedFailure # @unittest.skip("skip") @@ -2016,8 +2016,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase): # Clean after yourself pg_receivexlog.kill() - self.del_test_dir( - module_name, fname, [node, replica, node_restored]) + self.del_test_dir(module_name, fname) @unittest.skip("skip") def test_multi_timeline_recovery_prefetching(self): diff --git a/tests/backup.py b/tests/backup.py index 70c4dc13..65851d0f 100644 --- a/tests/backup.py +++ b/tests/backup.py @@ -1065,7 +1065,7 @@ class BackupTest(ProbackupTest, unittest.TestCase): self.compare_pgdata(pgdata, pgdata_restored) # Clean after yourself - self.del_test_dir(module_name, fname, nodes=[node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_tablespace_handling_1(self): @@ -1599,7 +1599,7 @@ class BackupTest(ProbackupTest, unittest.TestCase): options=['--stream', '--slot=slot_1', '--temp-slot']) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_backup_concurrent_drop_table(self): @@ -1645,7 +1645,7 @@ class BackupTest(ProbackupTest, unittest.TestCase): self.assertEqual(show_backup['status'], "OK") # Clean after yourself - self.del_test_dir(module_name, fname, nodes=[node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_pg_11_adjusted_wal_segment_size(self): @@ -1930,7 +1930,7 @@ class BackupTest(ProbackupTest, unittest.TestCase): os.chmod(full_path, 700) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_basic_missing_dir_permissions(self): @@ -1973,7 +1973,7 @@ class BackupTest(ProbackupTest, unittest.TestCase): os.rmdir(full_path) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_backup_with_least_privileges_role(self): diff --git a/tests/checkdb.py b/tests/checkdb.py index 3349ad2e..5b7a156c 100644 --- a/tests/checkdb.py +++ b/tests/checkdb.py @@ -349,7 +349,7 @@ class CheckdbTest(ProbackupTest, unittest.TestCase): log_file_content) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_checkdb_block_validation_sanity(self): diff --git a/tests/compression.py b/tests/compression.py index 321461d6..c10a5948 100644 --- a/tests/compression.py +++ b/tests/compression.py @@ -117,7 +117,7 @@ class CompressionTest(ProbackupTest, unittest.TestCase): self.assertEqual(delta_result, delta_result_new) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) def test_compression_archive_zlib(self): """ diff --git a/tests/delta.py b/tests/delta.py index daa423d4..e18b8fb6 100644 --- a/tests/delta.py +++ b/tests/delta.py @@ -80,7 +80,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase): node_restored.slow_start() # Clean after yourself - self.del_test_dir(module_name, fname, [node, node_restored]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_delta_vacuum_truncate_1(self): diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py index 76eac692..a84caba4 100644 --- a/tests/helpers/ptrack_helpers.py +++ b/tests/helpers/ptrack_helpers.py @@ -1519,7 +1519,7 @@ class ProbackupTest(object): if o.__class__ is testgres.PostgresNode: o.cleanup() - def del_test_dir(self, module_name, fname, nodes=[]): + def del_test_dir(self, module_name, fname): """ Del testdir and optimistically try to del module dir""" self.clean_all() diff --git a/tests/incr_restore.py b/tests/incr_restore.py index a228bdd7..885a88c2 100644 --- a/tests/incr_restore.py +++ b/tests/incr_restore.py @@ -720,7 +720,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): repr(e.message), self.cmd)) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_incr_checksum_restore(self): @@ -809,7 +809,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): self.compare_pgdata(pgdata, pgdata_restored) # Clean after yourself - self.del_test_dir(module_name, fname, [node, node_1]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") @@ -898,7 +898,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): self.compare_pgdata(pgdata, pgdata_restored) # Clean after yourself - self.del_test_dir(module_name, fname, [node, node_1]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_incr_lsn_sanity(self): @@ -967,7 +967,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): repr(e.message), self.cmd)) # Clean after yourself - self.del_test_dir(module_name, fname, [node_1]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_incr_checksum_sanity(self): @@ -1026,7 +1026,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): self.compare_pgdata(pgdata, pgdata_restored) # Clean after yourself - self.del_test_dir(module_name, fname, [node_1]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") @@ -1561,7 +1561,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): pgbench.wait() # Clean after yourself - self.del_test_dir(module_name, fname, [new_master, old_master]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_make_replica_via_incr_lsn_restore(self): @@ -1634,7 +1634,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): pgbench.wait() # Clean after yourself - self.del_test_dir(module_name, fname, [new_master, old_master]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") # @unittest.expectedFailure @@ -1878,7 +1878,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): '1') # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") # @unittest.expectedFailure @@ -2137,7 +2137,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): self.assertNotIn('PANIC', output) # Clean after yourself - self.del_test_dir(module_name, fname, [node, node2]) + self.del_test_dir(module_name, fname) def test_incremental_partial_restore_exclude_lsn(self): """""" @@ -2247,7 +2247,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): self.assertNotIn('PANIC', output) # Clean after yourself - self.del_test_dir(module_name, fname, [node2]) + self.del_test_dir(module_name, fname) def test_incremental_partial_restore_exclude_tablespace_checksum(self): """""" @@ -2391,7 +2391,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase): self.assertNotIn('PANIC', output) # Clean after yourself - self.del_test_dir(module_name, fname, [node2]) + self.del_test_dir(module_name, fname) def test_incremental_pg_filenode_map(self): """ diff --git a/tests/merge.py b/tests/merge.py index 29d60433..186b2f20 100644 --- a/tests/merge.py +++ b/tests/merge.py @@ -101,7 +101,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): self.assertEqual(count1, count2) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) def test_merge_compressed_backups(self): """ @@ -2245,7 +2245,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): repr(e.message), self.cmd)) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_smart_merge(self): @@ -2305,7 +2305,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): logfile_content = f.read() # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) def test_idempotent_merge(self): """ @@ -2380,7 +2380,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): self.assertEqual( page_id_2, self.show_pb(backup_dir, 'node')[0]['id']) - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) def test_merge_correct_inheritance(self): """ @@ -2435,7 +2435,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): page_meta['expire-time'], self.show_pb(backup_dir, 'node', page_id)['expire-time']) - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) def test_merge_correct_inheritance_1(self): """ @@ -2485,7 +2485,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): 'expire-time', self.show_pb(backup_dir, 'node', page_id)) - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") # @unittest.expectedFailure @@ -2604,7 +2604,7 @@ class MergeTest(ProbackupTest, unittest.TestCase): '-d', 'postgres', '-p', str(node_restored.port)]) # Clean after yourself - self.del_test_dir(module_name, fname, [node, node_restored]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") # @unittest.expectedFailure diff --git a/tests/page.py b/tests/page.py index c0dbb69f..8208e831 100644 --- a/tests/page.py +++ b/tests/page.py @@ -100,7 +100,7 @@ class PageTest(ProbackupTest, unittest.TestCase): self.assertEqual(result1, result2) # Clean after yourself - self.del_test_dir(module_name, fname, [node, node_restored]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_page_vacuum_truncate_1(self): diff --git a/tests/ptrack.py b/tests/ptrack.py index c45ecd6e..de76d1d3 100644 --- a/tests/ptrack.py +++ b/tests/ptrack.py @@ -3148,7 +3148,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase): 'select 1') # Clean after yourself - self.del_test_dir(module_name, fname, [master, replica, node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") # @unittest.expectedFailure diff --git a/tests/replica.py b/tests/replica.py index f664ca88..345f8a7d 100644 --- a/tests/replica.py +++ b/tests/replica.py @@ -418,7 +418,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase): options=['--archive-timeout=30s', '--stream']) # Clean after yourself - self.del_test_dir(module_name, fname, [master, replica]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_take_backup_from_delayed_replica(self): diff --git a/tests/retention.py b/tests/retention.py index 6dc8536c..24884574 100644 --- a/tests/retention.py +++ b/tests/retention.py @@ -1008,7 +1008,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase): 'FULL') # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_basic_window_merge_multiple_descendants_1(self): @@ -1275,7 +1275,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase): '--delete-expired', '--log-level-console=log']) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_window_chains(self): @@ -2535,4 +2535,4 @@ class RetentionTest(ProbackupTest, unittest.TestCase): self.validate_pb(backup_dir, 'node') - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) diff --git a/tests/validate.py b/tests/validate.py index cfec234d..62116be8 100644 --- a/tests/validate.py +++ b/tests/validate.py @@ -298,7 +298,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase): 'Backup STATUS should be "ORPHAN"') # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.skip("skip") def test_validate_corrupted_intermediate_backups(self): @@ -3843,7 +3843,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase): self.assertIn("WARNING: Some backups are not valid", e.message) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.expectedFailure # @unittest.skip("skip") @@ -3906,7 +3906,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase): self.assertIn("WARNING: Some backups are not valid", e.message) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # @unittest.expectedFailure # @unittest.skip("skip") @@ -3966,7 +3966,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase): self.assertIn("WARNING: Some backups are not valid", e.message) # Clean after yourself - self.del_test_dir(module_name, fname, [node]) + self.del_test_dir(module_name, fname) # validate empty backup list # page from future during validate