db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-24 08:52:38 +02:00
Code Issues Releases Activity

Merge branch 'REL_2_5_correct_test_skip' into REL_2_5

Browse Source
This commit is contained in:
Yura Sokolov 2022-11-15 13:03:45 +03:00
commit de411ed393
15 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/archive.py
View File

@ -86,7 +86,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(node) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because pg_control_checkpoint() is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -717,7 +717,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -848,7 +848,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
replica = self.make_simple_node(
@ -929,7 +929,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
make sure that archiving on both node is working.
"""
if self.pg_config_version < self.version_to_num('9.6.0'):
return unittest.skip('You need PostgreSQL >= 9.6 for this test')
self.skipTest('You need PostgreSQL >= 9.6 for this test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -943,7 +943,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
replica = self.make_simple_node(
@ -1035,7 +1035,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
"""
if self.pg_config_version < self.version_to_num('11.0'):
return unittest.skip('You need PostgreSQL >= 11 for this test')
self.skipTest('You need PostgreSQL >= 11 for this test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1196,7 +1196,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
self.add_instance(backup_dir, 'node', node)
node.slow_start()
if self.get_version(node) < self.version_to_num('10.0'):
return unittest.skip('You need PostgreSQL >= 10 for this test')
self.skipTest('You need PostgreSQL >= 10 for this test')
else:
pg_receivexlog_path = self.get_bin_path('pg_receivewal')
@ -1278,7 +1278,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1938,7 +1938,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
check that archive-push works correct with symlinked waldir
"""
if self.pg_config_version < self.version_to_num('10.0'):
return unittest.skip(
self.skipTest(
'Skipped because waldir outside pgdata is supported since PG 10')
fname = self.id().split('.')[3]
@ -2176,7 +2176,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(node) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -2385,7 +2385,7 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
if self.get_version(node) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)

8
tests/backup.py
View File

@ -1460,7 +1460,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
pg_options={'max_wal_size': '40MB'})
if self.get_version(node) < self.version_to_num('10.0'):
return unittest.skip('You need PostgreSQL >= 10 for this test')
self.skipTest('You need PostgreSQL >= 10 for this test')
self.init_pb(backup_dir)
self.add_instance(backup_dir, 'node', node)
@ -1532,7 +1532,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
def test_pg_11_adjusted_wal_segment_size(self):
""""""
if self.pg_config_version < self.version_to_num('11.0'):
return unittest.skip('You need PostgreSQL >= 11 for this test')
self.skipTest('You need PostgreSQL >= 11 for this test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1775,7 +1775,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
def test_basic_missing_file_permissions(self):
""""""
if os.name == 'nt':
return unittest.skip('Skipped because it is POSIX only test')
self.skipTest('Skipped because it is POSIX only test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1822,7 +1822,7 @@ class BackupTest(ProbackupTest, unittest.TestCase):
def test_basic_missing_dir_permissions(self):
""""""
if os.name == 'nt':
return unittest.skip('Skipped because it is POSIX only test')
self.skipTest('Skipped because it is POSIX only test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

14
tests/catchup.py
View File

@ -190,7 +190,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test ptrack catchup
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
# preparation 1: source
src_pg = self.make_simple_node(
@ -336,7 +336,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test that we correctly follow timeline change with ptrack catchup
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
# preparation 1: source
src_pg = self.make_simple_node(
@ -475,7 +475,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test that dropped table in source will be dropped in ptrack catchup'ed instance too
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
# preparation 1: source
src_pg = self.make_simple_node(
@ -590,7 +590,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test that truncated table in source will be truncated in ptrack catchup'ed instance too
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
# preparation 1: source
src_pg = self.make_simple_node(
@ -655,7 +655,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test that we detect absence of needed --tablespace-mapping option
"""
if self.remote:
return unittest.skip('Skipped because this test tests local catchup error handling')
self.skipTest('Skipped because this test tests local catchup error handling')
src_pg = self.make_simple_node(base_dir = os.path.join(module_name, self.fname, 'src'))
src_pg.slow_start()
@ -1035,7 +1035,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test that we correctly recover uncleanly shutdowned destination
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
# preparation 1: source
src_pg = self.make_simple_node(
@ -1507,7 +1507,7 @@ class CatchupTest(ProbackupTest, unittest.TestCase):
Test dry-run option for catchup in incremental ptrack mode
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
# preparation 1: source
src_pg = self.make_simple_node(

2
tests/compatibility.py
View File

@ -366,7 +366,7 @@ class CompatibilityTest(ProbackupTest, unittest.TestCase):
"""Description in jira issue PGPRO-434"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

2
tests/delete.py
View File

@ -189,7 +189,7 @@ class DeleteTest(ProbackupTest, unittest.TestCase):
def test_delete_increment_ptrack(self):
"""delete increment and all after him"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(

6
tests/external.py
View File

@ -1535,7 +1535,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
but restored as directory
"""
if os.name == 'nt':
return unittest.skip('Skipped for Windows')
self.skipTest('Skipped for Windows')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1618,7 +1618,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
but restored as directory
"""
if os.name == 'nt':
return unittest.skip('Skipped for Windows')
self.skipTest('Skipped for Windows')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1703,7 +1703,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
but restored as directory
"""
if os.name == 'nt':
return unittest.skip('Skipped for Windows')
self.skipTest('Skipped for Windows')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

2
tests/false_positive.py
View File

@ -114,7 +114,7 @@ class FalsePositive(ProbackupTest, unittest.TestCase):
test group access for PG >= 11
"""
if self.pg_config_version < self.version_to_num('10.0'):
return unittest.skip('You need PostgreSQL >= 10 for this test')
self.skipTest('You need PostgreSQL >= 10 for this test')
fname = self.id().split('.')[3]
wal_dir = os.path.join(

9
tests/helpers/__init__.py
View File

@ -1,2 +1,9 @@
__all__ = ['ptrack_helpers', 'cfs_helpers', 'expected_errors']
#from . import *
import unittest
# python 2.7 compatibility
if not hasattr(unittest.TestCase, "skipTest"):
def skipTest(self, reason):
raise unittest.SkipTest(reason)
unittest.TestCase.skipTest = skipTest

4
tests/incr_restore.py
View File

@ -1494,7 +1494,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1567,7 +1567,7 @@ class IncrRestoreTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)

2
tests/merge.py
View File

@ -796,7 +796,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
restore last page backup and check data correctness
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

2
tests/option.py
View File

@ -239,5 +239,5 @@ class OptionTest(ProbackupTest, unittest.TestCase):
help_out.read().decode("utf-8")
)
else:
return unittest.skip(
self.skipTest(
'You need configure PostgreSQL with --enabled-nls option for this test')

34
tests/replica.py
View File

@ -30,7 +30,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(node1) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -103,10 +103,10 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
take full stream backup from replica
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
if self.pg_config_version > self.version_to_num('9.6.0'):
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
fname = self.id().split('.')[3]
@ -241,7 +241,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -383,7 +383,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -441,7 +441,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -554,7 +554,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -645,7 +645,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -730,7 +730,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -833,7 +833,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -917,7 +917,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1006,7 +1006,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1108,7 +1108,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1186,7 +1186,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1313,7 +1313,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(node1) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1438,7 +1438,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(node1) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)
@ -1560,7 +1560,7 @@ class ReplicaTest(ProbackupTest, unittest.TestCase):
if self.get_version(master) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
self.skipTest(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir)

18
tests/restore.py
View File

@ -500,7 +500,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
def test_restore_full_ptrack_archive(self):
"""recovery to latest from archive full+ptrack backups"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(
@ -554,7 +554,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
def test_restore_ptrack(self):
"""recovery to latest from archive full+ptrack+ptrack backups"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(
@ -615,7 +615,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
def test_restore_full_ptrack_stream(self):
"""recovery in stream mode to latest from full + ptrack backups"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(
@ -673,7 +673,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
with loads when ptrack backup do
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(
@ -742,7 +742,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
with loads when full backup do
"""
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(
@ -2345,7 +2345,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
test group access for PG >= 11
"""
if self.pg_config_version < self.version_to_num('11.0'):
return unittest.skip('You need PostgreSQL >= 11 for this test')
self.skipTest('You need PostgreSQL >= 11 for this test')
fname = self.id().split('.')[3]
node = self.make_simple_node(
@ -3680,7 +3680,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
self.skipTest("You must specify PGPROBACKUPBIN_OLD"
" for run this test")
if self.pg_config_version < self.version_to_num('12.0'):
return unittest.skip('You need PostgreSQL >= 12 for this test')
self.skipTest('You need PostgreSQL >= 12 for this test')
if self.version_to_num(self.old_probackup_version) >= self.version_to_num('2.4.5'):
self.assertTrue(False, 'You need pg_probackup < 2.4.5 for this test')
@ -3752,7 +3752,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
"""
if self.pg_config_version < self.version_to_num('12.0'):
return unittest.skip('You need PostgreSQL >= 12 for this test')
self.skipTest('You need PostgreSQL >= 12 for this test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -3797,7 +3797,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
"""
if self.pg_config_version < self.version_to_num('12.0'):
return unittest.skip('You need PostgreSQL >= 12 for this test')
self.skipTest('You need PostgreSQL >= 12 for this test')
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

4
tests/retention.py
View File

@ -1603,7 +1603,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
if self.get_version(node) < 90600:
self.del_test_dir(module_name, fname)
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
self.init_pb(backup_dir)
@ -1653,7 +1653,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
if self.get_version(node) < 90600:
self.del_test_dir(module_name, fname)
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
self.init_pb(backup_dir)

4
tests/time_consuming.py
View File

@ -16,9 +16,9 @@ class TimeConsumingTests(ProbackupTest, unittest.TestCase):
"""
# init node
if self.pg_config_version < self.version_to_num('11.0'):
return unittest.skip('You need PostgreSQL >= 11 for this test')
self.skipTest('You need PostgreSQL >= 11 for this test')
if not self.ptrack:
return unittest.skip('Skipped because ptrack support is disabled')
self.skipTest('Skipped because ptrack support is disabled')
fname = self.id().split('.')[3]
node = self.make_simple_node(