Try to fix caughtup in LR tests.

arssher · arssher · commit 87a0491f3b1a · 2019-11-19T15:17:13.000+03:00
diff --git a/testgres/pubsub.py b/testgres/pubsub.py
@@ -186,12 +186,19 @@ def catchup(self, username=None):
         Args:
             username: remote node's user name.
         """
-        query = """
-            select pg_current_wal_lsn() - replay_lsn = 0
-            from pg_catalog.pg_stat_replication where application_name = '{}'
-        """.format(self.name)
 
         try:
+            pub_lsn = pub.node.execute(query="select pg_current_wal_lsn()::text from pg_catalog.pg_stat_replication",
+                                       dbname=None,
+                                       username=None)  # yapf: disable
+            # create dummy xact
+            pub.node.execute(query="select txid_current()", dbname=None, username=None)
+            query = """
+            select {} - replay_lsn <= 0
+            from pg_catalog.pg_stat_replication where application_name = '{}'
+            """.format(pub_lsn, self.name)
+
+
             # wait until this LSN reaches subscriber
             self.pub.node.poll_query_until(
                 query=query,
