Fix python tests for pg10

maksm90 · maksm90 · commit 42ce25b66087 · 2017-05-25T16:55:47.000+03:00
diff --git a/tests/python/partitioning_test.py b/tests/python/partitioning_test.py
@@ -16,8 +16,9 @@
 import subprocess
 import threading
 
-from testgres import get_new_node, stop_all
+from testgres import get_new_node, stop_all, get_config
 
+version = get_config().get("VERSION_NUM")
 
 # Helper function for json equality
 def ordered(obj):
@@ -68,11 +69,17 @@ def init_test_data(self, node):
 
 	def catchup_replica(self, master, replica):
 		"""Wait until replica synchronizes with master"""
-		master.poll_query_until(
-			'postgres',
-			'SELECT pg_current_xlog_location() <= replay_location '
-			'FROM pg_stat_replication WHERE application_name = \'%s\''
-			% replica.name)
+		if version >= 100000:
+			wait_lsn_query = \
+				'SELECT pg_current_wal_lsn() <= replay_lsn ' \
+				'FROM pg_stat_replication WHERE application_name = \'%s\'' \
+				% replica.name
+		else:
+			wait_lsn_query = \
+				'SELECT pg_current_xlog_location() <= replay_location ' \
+				'FROM pg_stat_replication WHERE application_name = \'%s\'' \
+				% replica.name
+		master.poll_query_until('postgres', wait_lsn_query)
 
 	def printlog(self, logfile):
 		with open(logfile, 'r') as log:
@@ -482,7 +489,6 @@ def test_parallel_nodes(self):
 
 		# Check version of postgres server
 		# If version < 9.6 skip all tests for parallel queries
-		version = int(node.psql("postgres", "show server_version_num")[1])
 		if version < 90600:
 			return
 
@@ -512,7 +518,10 @@ def test_parallel_nodes(self):
 		# Test parallel select
 		with node.connect() as con:
 			con.execute('set max_parallel_workers_per_gather = 2')
-			con.execute('set min_parallel_relation_size = 0')
+			if version >= 100000:
+				con.execute('set min_parallel_table_scan_size = 0')
+			else:
+				con.execute('set min_parallel_relation_size = 0')
 			con.execute('set parallel_setup_cost = 0')
 			con.execute('set parallel_tuple_cost = 0')
 
