Skip to content

Commit d4d78e1

Browse files
committed
[PBCKP-277] stabilize catchup.CatchupTest.test_config_exclusion
1 parent a4a2abd commit d4d78e1

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

.travis.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ notifications:
2626

2727
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
2828
env:
29-
- PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
30-
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
31-
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
32-
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
33-
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_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
29+
# - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
30+
# - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
31+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
32+
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
33+
# - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_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
3737
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
3838
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
39-
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
39+
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
40+
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
41+
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
42+
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
43+
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=catchup.CatchupTest.test_config_exclusion
44+
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=catchup.CatchupTest.test_config_exclusion
45+
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=catchup.CatchupTest.test_config_exclusion
4046
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
4147
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
4248
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta

tests/catchup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,6 +1362,7 @@ def test_config_exclusion(self):
13621362
dst_options = {}
13631363
dst_options['port'] = str(dst_pg.port)
13641364
self.set_auto_conf(dst_pg, dst_options)
1365+
dst_pg._assign_master(src_pg)
13651366
dst_pg.slow_start(replica = True)
13661367
dst_pg.stop()
13671368

@@ -1390,6 +1391,7 @@ def test_config_exclusion(self):
13901391
# check: run verification query
13911392
src_pg.safe_psql("postgres", "INSERT INTO ultimate_question VALUES(42)")
13921393
src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
1394+
dst_pg.catchup() # wait for replication
13931395
dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
13941396
self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')
13951397

@@ -1419,6 +1421,7 @@ def test_config_exclusion(self):
14191421
# check: run verification query
14201422
src_pg.safe_psql("postgres", "INSERT INTO ultimate_question VALUES(2*42)")
14211423
src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
1424+
dst_pg.catchup() # wait for replication
14221425
dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
14231426
self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')
14241427

@@ -1447,6 +1450,7 @@ def test_config_exclusion(self):
14471450
# check: run verification query
14481451
src_pg.safe_psql("postgres", "INSERT INTO ultimate_question VALUES(3*42)")
14491452
src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
1453+
dst_pg.catchup() # wait for replication
14501454
dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
14511455
self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')
14521456

0 commit comments

Comments
 (0)