compatibility fix for postgres 10

Author: zilder

testgres/testgres.py

@@ -597,7 +597,7 @@ def backup(self, name):
         backup_path = os.path.join(self.base_dir, name)
         os.makedirs(backup_path)
         params = [pg_basebackup, "-D", backup_path, "-p {}".format(
-            self.port), "-x"]
+            self.port), "-X", "fetch"]
         with open(self.output_filename, "a") as file_out, \
                 open(self.error_filename, "a") as file_err:
             ret = subprocess.call(

testgres/tests/test_simple.py

@@ -6,7 +6,7 @@
 import tempfile
 import logging.config
 
-from testgres import get_new_node, stop_all
+from testgres import get_new_node, stop_all, get_config
 
 
 class SimpleTest(unittest.TestCase):
@@ -41,15 +41,21 @@ def test_backup_and_replication(self):
         self.assertEqual(len(res), 1)
         self.assertEqual(res[0], (1, 2))
 
+        # Prepare the query which would check whether record reached replica
+        # (It is slightly different for Postgres 9.6 and Postgres 10+)
+        if get_config()['VERSION_NUM'] >= 1000000:
+            wait_lsn = 'SELECT pg_current_wal_lsn() <= replay_lsn '           \
+                'FROM pg_stat_replication WHERE application_name = \'%s\''    \
+                % replica.name
+        else:
+            wait_lsn = 'SELECT pg_current_xlog_location() <= replay_location '\
+                'FROM pg_stat_replication WHERE application_name = \'%s\''    \
+                % replica.name
+
         # Insert into master node
         node.psql('postgres', 'insert into abc values (3, 4)')
         # Wait until data syncronizes
-        node.poll_query_until(
-            'postgres',
-            'SELECT pg_current_xlog_location() <= replay_location '
-            'FROM pg_stat_replication WHERE application_name = \'%s\''
-            % replica.name)
-        # time.sleep(0.5)
+        node.poll_query_until('postgres', wait_lsn)
         # Check that this record was exported to replica
         res = replica.execute('postgres', 'select * from abc')
         self.assertEqual(len(res), 2)
@@ -83,7 +89,7 @@ def test_users(self):
         self.assertEqual(value, six.b('1\n'))
 
     def test_logging(self):
-        regex = re.compile('\w+:\s{1}LOG:.*')
+        regex = re.compile('.+?LOG:.*')
         logfile = tempfile.NamedTemporaryFile('w', delete=True)
 
         log_conf = {