[PBCKP-277] stabilize catchup.CatchupTest.test_config_exclusion

Author: kulaginm

.travis.yml

@@ -26,17 +26,23 @@ notifications:
 
 # Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
 env:
-    - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
-    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
-    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
-    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
-    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
-    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
-    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
+#    - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
+#    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
+#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
+#    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
+#    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
+#    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
+#    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
+    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
+    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
+    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup.CatchupTest.test_config_exclusion
+    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=catchup.CatchupTest.test_config_exclusion
+    - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=catchup.CatchupTest.test_config_exclusion
+    - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE MODE=catchup.CatchupTest.test_config_exclusion
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta

tests/catchup.py

@@ -1362,6 +1362,7 @@ def test_config_exclusion(self):
         dst_options = {}
         dst_options['port'] = str(dst_pg.port)
         self.set_auto_conf(dst_pg, dst_options)
+        dst_pg._assign_master(src_pg)
         dst_pg.slow_start(replica = True)
         dst_pg.stop()
 
@@ -1390,6 +1391,7 @@ def test_config_exclusion(self):
         # check: run verification query
         src_pg.safe_psql("postgres", "INSERT INTO ultimate_question VALUES(42)")
         src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
+        dst_pg.catchup() # wait for replication
         dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
         self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')
 
@@ -1419,6 +1421,7 @@ def test_config_exclusion(self):
         # check: run verification query
         src_pg.safe_psql("postgres", "INSERT INTO ultimate_question VALUES(2*42)")
         src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
+        dst_pg.catchup() # wait for replication
         dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
         self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')
 
@@ -1447,6 +1450,7 @@ def test_config_exclusion(self):
         # check: run verification query
         src_pg.safe_psql("postgres", "INSERT INTO ultimate_question VALUES(3*42)")
         src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
+        dst_pg.catchup() # wait for replication
         dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
         self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')