postgrespro
diff --git a/‎tests/__init__.py
+2-1 b/‎tests/__init__.py
+2-1
diff --git a/‎tests/helpers/ptrack_helpers.py
+26 b/‎tests/helpers/ptrack_helpers.py
+26
@@ -2,7 +2,7 @@
 
 from . import init_test, merge, option_test, show_test, compatibility, \
     backup_test, delete_test, delta, restore_test, validate_test, \
-    retention_test, ptrack_clean, ptrack_cluster, \
+    retention_test, ptrack_clean, ptrack_empty, ptrack_cluster, \
     ptrack_move_to_tablespace, ptrack_recovery, ptrack_truncate, \
     ptrack_vacuum, ptrack_vacuum_bits_frozen, ptrack_vacuum_bits_visibility, \
     ptrack_vacuum_full, ptrack_vacuum_truncate, pgpro560, pgpro589, \
@@ -31,6 +31,7 @@ def load_tests(loader, tests, pattern):
     suite.addTests(loader.loadTestsFromModule(page))
     suite.addTests(loader.loadTestsFromModule(ptrack))
     suite.addTests(loader.loadTestsFromModule(ptrack_clean))
+    suite.addTests(loader.loadTestsFromModule(ptrack_empty))
     suite.addTests(loader.loadTestsFromModule(ptrack_cluster))
     suite.addTests(loader.loadTestsFromModule(ptrack_move_to_tablespace))
     suite.addTests(loader.loadTestsFromModule(ptrack_recovery))
 
@@ -48,6 +48,11 @@
         'column': 'tsvector',
         'relation': 't_heap'
     },
+    't_hash': {
+        'type': 'hash',
+        'column': 'id',
+        'relation': 't_heap'
+    }
 }
 
 archive_script = """
@@ -1002,6 +1007,27 @@ def switch_wal_segment(self, node):
             else:
                 node.execute("select pg_switch_xlog()")
 
+    def wait_until_replica_catch_with_master(self, master, replica):
+
+        if self.version_to_num(
+                master.safe_psql(
+                    "postgres",
+                    "show server_version")) >= self.version_to_num('10.0'):
+            master_function = 'pg_catalog.pg_current_wal_lsn()'
+            replica_function = 'pg_catalog.pg_last_wal_replay_lsn()'
+        else:
+            master_function = 'pg_catalog.pg_current_xlog_location()'
+            replica_function = 'pg_catalog.pg_last_xlog_replay_location()'
+
+        lsn = master.safe_psql(
+            'postgres',
+            'SELECT {0}'.format(master_function)).rstrip()
+
+        # Wait until replica catch up with master
+        replica.poll_query_until(
+            'postgres',
+            "SELECT '{0}'::pg_lsn <= {1}".format(lsn, replica_function))
+
     def get_version(self, node):
         return self.version_to_num(
             testgres.get_pg_config()["VERSION"].split(" ")[1])