Skip to content

Commit b3e9072

Browse files
committed
[Issue #439] skip unsupported tests in 9.5 (tests with backups from replica and with pg_control_checkpoint() calling)
1 parent 6081c08 commit b3e9072

File tree

2 files changed

+36
-8
lines changed

2 files changed

+36
-8
lines changed

Diff for: .travis.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ notifications:
2626

2727
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
2828
env:
29-
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE
30-
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE
31-
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE
32-
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE
33-
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE
34-
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
35-
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
29+
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=archive
30+
# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE
31+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE
32+
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE
33+
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE
34+
# - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
35+
# - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
36+
# - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
3637
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
3738
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
3839
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression

Diff for: tests/archive.py

+28-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ def test_pgpro434_2(self):
8383
pg_options={
8484
'checkpoint_timeout': '30s'}
8585
)
86+
87+
if self.get_version(node) < self.version_to_num('9.6.0'):
88+
self.del_test_dir(module_name, fname)
89+
return unittest.skip(
90+
'Skipped because pg_control_checkpoint() is not supported in PG 9.5')
91+
8692
self.init_pb(backup_dir)
8793
self.add_instance(backup_dir, 'node', node)
8894
self.set_archiving(backup_dir, 'node', node)
@@ -693,6 +699,11 @@ def test_replica_archive(self):
693699
'checkpoint_timeout': '30s',
694700
'max_wal_size': '32MB'})
695701

702+
if self.get_version(master) < self.version_to_num('9.6.0'):
703+
self.del_test_dir(module_name, fname)
704+
return unittest.skip(
705+
'Skipped because backup from replica is not supported in PG 9.5')
706+
696707
self.init_pb(backup_dir)
697708
# ADD INSTANCE 'MASTER'
698709
self.add_instance(backup_dir, 'master', master)
@@ -818,6 +829,12 @@ def test_master_and_replica_parallel_archiving(self):
818829
pg_options={
819830
'archive_timeout': '10s'}
820831
)
832+
833+
if self.get_version(master) < self.version_to_num('9.6.0'):
834+
self.del_test_dir(module_name, fname)
835+
return unittest.skip(
836+
'Skipped because backup from replica is not supported in PG 9.5')
837+
821838
replica = self.make_simple_node(
822839
base_dir=os.path.join(module_name, fname, 'replica'))
823840
replica.cleanup()
@@ -908,6 +925,11 @@ def test_basic_master_and_replica_concurrent_archiving(self):
908925
'checkpoint_timeout': '30s',
909926
'archive_timeout': '10s'})
910927

928+
if self.get_version(master) < self.version_to_num('9.6.0'):
929+
self.del_test_dir(module_name, fname)
930+
return unittest.skip(
931+
'Skipped because backup from replica is not supported in PG 9.5')
932+
911933
replica = self.make_simple_node(
912934
base_dir=os.path.join(module_name, fname, 'replica'))
913935
replica.cleanup()
@@ -2009,6 +2031,11 @@ def test_archive_pg_receivexlog_partial_handling(self):
20092031
set_replication=True,
20102032
initdb_params=['--data-checksums'])
20112033

2034+
if self.get_version(node) < self.version_to_num('9.6.0'):
2035+
self.del_test_dir(module_name, fname)
2036+
return unittest.skip(
2037+
'Skipped because backup from replica is not supported in PG 9.5')
2038+
20122039
self.init_pb(backup_dir)
20132040
self.add_instance(backup_dir, 'node', node)
20142041

@@ -2655,4 +2682,4 @@ def test_archive_empty_history_file(self):
26552682
#t2 ----------------
26562683
# /
26572684
#t1 -A--------
2658-
#
2685+
#

0 commit comments

Comments
 (0)