db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-07-04 05:40:26 +02:00
Code Issues Releases Activity

delete nodes in del_test_dir

Browse Source
This commit is contained in:
a.kozhemyakin
2021-02-18 05:13:11 +00:00
parent 2193cd76fc
commit dd8c23c9b1
13 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/archive.py
View File

@ -981,7 +981,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
self.backup_node(backup_dir, 'master', replica) self.backup_node(backup_dir, 'master', replica)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, nodes=[master, replica]) self.del_test_dir(module_name, fname)
# @unittest.expectedFailure # @unittest.expectedFailure
# @unittest.skip("skip") # @unittest.skip("skip")
@ -2016,8 +2016,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
# Clean after yourself # Clean after yourself
pg_receivexlog.kill() pg_receivexlog.kill()
self.del_test_dir( self.del_test_dir(module_name, fname)
module_name, fname, [node, replica, node_restored])
@unittest.skip("skip") @unittest.skip("skip")
def test_multi_timeline_recovery_prefetching(self): def test_multi_timeline_recovery_prefetching(self):

10
tests/backup.py
View File

@ -1065,7 +1065,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
self.compare_pgdata(pgdata, pgdata_restored) self.compare_pgdata(pgdata, pgdata_restored)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, nodes=[node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_tablespace_handling_1(self): def test_tablespace_handling_1(self):
@ -1599,7 +1599,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
options=['--stream', '--slot=slot_1', '--temp-slot']) options=['--stream', '--slot=slot_1', '--temp-slot'])
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_backup_concurrent_drop_table(self): def test_backup_concurrent_drop_table(self):
@ -1645,7 +1645,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
self.assertEqual(show_backup['status'], "OK") self.assertEqual(show_backup['status'], "OK")
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, nodes=[node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_pg_11_adjusted_wal_segment_size(self): def test_pg_11_adjusted_wal_segment_size(self):
@ -1930,7 +1930,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
os.chmod(full_path, 700) os.chmod(full_path, 700)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_basic_missing_dir_permissions(self): def test_basic_missing_dir_permissions(self):
@ -1973,7 +1973,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
os.rmdir(full_path) os.rmdir(full_path)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_backup_with_least_privileges_role(self): def test_backup_with_least_privileges_role(self):

2
tests/checkdb.py
View File

@ -349,7 +349,7 @@ class CheckdbTest(ProbackupTest, unittest.TestCase):
log_file_content) log_file_content)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_checkdb_block_validation_sanity(self): def test_checkdb_block_validation_sanity(self):

2
tests/compression.py
View File

@ -117,7 +117,7 @@ class CompressionTest(ProbackupTest, unittest.TestCase):
self.assertEqual(delta_result, delta_result_new) self.assertEqual(delta_result, delta_result_new)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
def test_compression_archive_zlib(self): def test_compression_archive_zlib(self):
""" """

2
tests/delta.py
View File

@ -80,7 +80,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
node_restored.slow_start() node_restored.slow_start()
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node, node_restored]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_delta_vacuum_truncate_1(self): def test_delta_vacuum_truncate_1(self):

2
tests/helpers/ptrack_helpers.py
View File

@ -1519,7 +1519,7 @@ class ProbackupTest(object):
if o.__class__ is testgres.PostgresNode: if o.__class__ is testgres.PostgresNode:
o.cleanup() 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""" """ Del testdir and optimistically try to del module dir"""
self.clean_all() self.clean_all()

22
tests/incr_restore.py
View File

@ -720,7 +720,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
repr(e.message), self.cmd)) repr(e.message), self.cmd))
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_incr_checksum_restore(self): def test_incr_checksum_restore(self):
@ -809,7 +809,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
self.compare_pgdata(pgdata, pgdata_restored) self.compare_pgdata(pgdata, pgdata_restored)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node, node_1]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
@ -898,7 +898,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
self.compare_pgdata(pgdata, pgdata_restored) self.compare_pgdata(pgdata, pgdata_restored)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node, node_1]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_incr_lsn_sanity(self): def test_incr_lsn_sanity(self):
@ -967,7 +967,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
repr(e.message), self.cmd)) repr(e.message), self.cmd))
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node_1]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_incr_checksum_sanity(self): def test_incr_checksum_sanity(self):
@ -1026,7 +1026,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
self.compare_pgdata(pgdata, pgdata_restored) self.compare_pgdata(pgdata, pgdata_restored)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node_1]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
@ -1561,7 +1561,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
pgbench.wait() pgbench.wait()
# Clean after yourself # 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.skip("skip")
def test_make_replica_via_incr_lsn_restore(self): def test_make_replica_via_incr_lsn_restore(self):
@ -1634,7 +1634,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
pgbench.wait() pgbench.wait()
# Clean after yourself # 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.skip("skip")
# @unittest.expectedFailure # @unittest.expectedFailure
@ -1878,7 +1878,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
'1') '1')
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
# @unittest.expectedFailure # @unittest.expectedFailure
@ -2137,7 +2137,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
self.assertNotIn('PANIC', output) self.assertNotIn('PANIC', output)
# Clean after yourself # 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): def test_incremental_partial_restore_exclude_lsn(self):
"""""" """"""
@ -2247,7 +2247,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
self.assertNotIn('PANIC', output) self.assertNotIn('PANIC', output)
# Clean after yourself # 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): def test_incremental_partial_restore_exclude_tablespace_checksum(self):
"""""" """"""
@ -2391,7 +2391,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
self.assertNotIn('PANIC', output) self.assertNotIn('PANIC', output)
# Clean after yourself # 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): def test_incremental_pg_filenode_map(self):
""" """

14
tests/merge.py
View File

@ -101,7 +101,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
self.assertEqual(count1, count2) self.assertEqual(count1, count2)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
def test_merge_compressed_backups(self): def test_merge_compressed_backups(self):
""" """
@ -2245,7 +2245,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
repr(e.message), self.cmd)) repr(e.message), self.cmd))
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_smart_merge(self): def test_smart_merge(self):
@ -2305,7 +2305,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
logfile_content = f.read() logfile_content = f.read()
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
def test_idempotent_merge(self): def test_idempotent_merge(self):
""" """
@ -2380,7 +2380,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
self.assertEqual( self.assertEqual(
page_id_2, self.show_pb(backup_dir, 'node')[0]['id']) 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): def test_merge_correct_inheritance(self):
""" """
@ -2435,7 +2435,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
page_meta['expire-time'], page_meta['expire-time'],
self.show_pb(backup_dir, 'node', page_id)['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): def test_merge_correct_inheritance_1(self):
""" """
@ -2485,7 +2485,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
'expire-time', 'expire-time',
self.show_pb(backup_dir, 'node', page_id)) 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.skip("skip")
# @unittest.expectedFailure # @unittest.expectedFailure
@ -2604,7 +2604,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
'-d', 'postgres', '-p', str(node_restored.port)]) '-d', 'postgres', '-p', str(node_restored.port)])
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node, node_restored]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
# @unittest.expectedFailure # @unittest.expectedFailure

2
tests/page.py
View File

@ -100,7 +100,7 @@ class PageTest(ProbackupTest, unittest.TestCase):
self.assertEqual(result1, result2) self.assertEqual(result1, result2)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node, node_restored]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_page_vacuum_truncate_1(self): def test_page_vacuum_truncate_1(self):

2
tests/ptrack.py
View File

@ -3148,7 +3148,7 @@ class PtrackTest(ProbackupTest, unittest.TestCase):
'select 1') 'select 1')
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [master, replica, node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
# @unittest.expectedFailure # @unittest.expectedFailure

2
tests/replica.py
View File

@ -418,7 +418,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
options=['--archive-timeout=30s', '--stream']) options=['--archive-timeout=30s', '--stream'])
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [master, replica]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_take_backup_from_delayed_replica(self): def test_take_backup_from_delayed_replica(self):

6
tests/retention.py
View File

@ -1008,7 +1008,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
'FULL') 'FULL')
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_basic_window_merge_multiple_descendants_1(self): def test_basic_window_merge_multiple_descendants_1(self):
@ -1275,7 +1275,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
'--delete-expired', '--log-level-console=log']) '--delete-expired', '--log-level-console=log'])
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_window_chains(self): def test_window_chains(self):
@ -2535,4 +2535,4 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
self.validate_pb(backup_dir, 'node') self.validate_pb(backup_dir, 'node')
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)

8
tests/validate.py
View File

@ -298,7 +298,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
'Backup STATUS should be "ORPHAN"') 'Backup STATUS should be "ORPHAN"')
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.skip("skip") # @unittest.skip("skip")
def test_validate_corrupted_intermediate_backups(self): 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) self.assertIn("WARNING: Some backups are not valid", e.message)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.expectedFailure # @unittest.expectedFailure
# @unittest.skip("skip") # @unittest.skip("skip")
@ -3906,7 +3906,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
self.assertIn("WARNING: Some backups are not valid", e.message) self.assertIn("WARNING: Some backups are not valid", e.message)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# @unittest.expectedFailure # @unittest.expectedFailure
# @unittest.skip("skip") # @unittest.skip("skip")
@ -3966,7 +3966,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
self.assertIn("WARNING: Some backups are not valid", e.message) self.assertIn("WARNING: Some backups are not valid", e.message)
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname, [node]) self.del_test_dir(module_name, fname)
# validate empty backup list # validate empty backup list
# page from future during validate # page from future during validate