For tests, explicitly disable replication and conditionally perform check for crypt.

jwp · jwp · commit 7ee74cd9118f · 2020-02-09T19:48:01.000-07:00
Tests are executed against databases in clusters that have restrained resources.
Replication being enabled was triggering failures with the current configuration.

Having the crypt user unconditionally created was causing errors in more recent
versions of PostgreSQL. Only check crypt with now unsupported versions.
diff --git a/postgresql/temporal.py b/postgresql/temporal.py
@@ -110,6 +110,7 @@ def init(self,
 				'could not find the default pg_config', details = inshint
 			)
 
+		vi = installation.version_info
 		cluster = Cluster(installation, self.cluster_path,)
 
 		# If it exists already, destroy it.
@@ -130,13 +131,18 @@ def init(self,
 				creator = cluster
 			)
 
+		if vi[:2] > (9,6):
+			# Default changed in 10.x
+			cluster.settings['max_wal_senders'] = '0'
+
 		cluster.settings.update(dict(
 			port = str(self.cluster_port),
 			max_connections = '20',
 			shared_buffers = '200',
 			listen_addresses = 'localhost',
 			log_destination = 'stderr',
 			log_min_messages = 'FATAL',
+			max_prepared_transactions = '10',
 		))
 
 		if installation.version_info[:2] < (9, 3):
@@ -148,10 +154,6 @@ def init(self,
 				unix_socket_directories = cluster.data_directory,
 			))
 
-		cluster.settings.update(dict(
-			max_prepared_transactions = '10',
-		))
-
 		# Start it up.
 		with open(self.logfile, 'w') as lfo:
 			cluster.start(logfile = lfo)
diff --git a/postgresql/test/test_cluster.py b/postgresql/test/test_cluster.py
@@ -30,11 +30,15 @@ def start_cluster(self, logfile = None):
 	def init(self, *args, **kw):
 		self.cluster.init(*args, **kw)
 
-		if self.cluster.installation.version_info[:2] >= (9, 3):
+		vi = self.cluster.installation.version_info[:2]
+		if vi >= (9, 3):
 			usd = 'unix_socket_directories'
 		else:
 			usd = 'unix_socket_directory'
 
+		if vi > (9, 6):
+			self.cluster.settings['max_wal_senders'] = '0'
+
 		self.cluster.settings.update({
 			'max_connections' : '8',
 			'listen_addresses' : 'localhost',
diff --git a/postgresql/test/test_connect.py b/postgresql/test/test_connect.py
@@ -51,7 +51,7 @@ def __init__(self, *args, **kw):
 		super().__init__(*args, **kw)
 		self.installation = installation.default()
 		self.cluster_path = \
-			'py_unittest_pg_cluster_' \
+			'pypg_test_' \
 			+ str(os.getpid()) + getattr(self, 'cluster_path_suffix', '')
 
 		if self.installation is None:
@@ -68,6 +68,8 @@ def __init__(self, *args, **kw):
 		if self.cluster.initialized():
 			self.cluster.drop()
 
+		self.disable_replication = self.installation.version_info[:2] > (9, 6)
+
 	def configure_cluster(self):
 		self.cluster_port = find_available_port()
 		if self.cluster_port is None:
@@ -79,6 +81,7 @@ def configure_cluster(self):
 		listen_addresses = '127.0.0.1'
 		if has_ipv6:
 			listen_addresses += ',::1'
+
 		self.cluster.settings.update(dict(
 			port = str(self.cluster_port),
 			max_connections = '6',
@@ -88,6 +91,11 @@ def configure_cluster(self):
 			log_min_messages = 'FATAL',
 		))
 
+		if self.disable_replication:
+			self.cluster.settings.update({
+				'max_wal_senders': '0',
+			})
+
 		if self.cluster.installation.version_info[:2] < (9, 3):
 			self.cluster.settings.update(dict(
 				unix_socket_directory = self.cluster.data_directory,
@@ -157,30 +165,43 @@ class test_connect(TestCaseWithCluster):
 	params = {}
 	cluster_path_suffix = '_test_connect'
 
+	mk_common_users = """
+		CREATE USER md5 WITH ENCRYPTED PASSWORD 'md5_password';
+		CREATE USER password WITH ENCRYPTED PASSWORD 'password_password';
+		CREATE USER trusted;
+	"""
+
+	mk_crypt_user = """
+		-- crypt doesn't work with encrypted passwords:
+		-- http://www.postgresql.org/docs/8.2/interactive/auth-methods.html#AUTH-PASSWORD
+		CREATE USER crypt WITH UNENCRYPTED PASSWORD 'crypt_password';
+	"""
+
 	def __init__(self, *args, **kw):
 		super().__init__(*args,**kw)
 		# 8.4 nixed this.
-		self.do_crypt = self.cluster.installation.version_info < (8,4)
+		vi = self.cluster.installation.version_info
+		self.check_crypt_user = (vi < (8,4))
 
 	def configure_cluster(self):
 		super().configure_cluster()
-		self.cluster.settings.update({
-			'log_min_messages' : 'log',
-		})
+		self.cluster.settings['log_min_messages'] = 'log'
 
 		# Configure the hba file with the supported methods.
 		with open(self.cluster.hba_file, 'w') as hba:
 			hosts = ['0.0.0.0/0',]
 			if has_ipv6:
 				hosts.append('0::0/0')
-			methods = ['md5', 'password'] + (['crypt'] if self.do_crypt else [])
+
+			methods = ['md5', 'password'] + (['crypt'] if self.check_crypt_user else [])
 			for h in hosts:
 				for m in methods:
 					# user and method are the same name.
 					hba.writelines(['host test {m} {h} {m}\n'.format(
 						h = h,
 						m = m
 					)])
+
 			# trusted
 			hba.writelines(["local all all trust\n"])
 			hba.writelines(["host test trusted 0.0.0.0/0 trust\n"])
@@ -193,26 +214,11 @@ def configure_cluster(self):
 
 	def initialize_database(self):
 		super().initialize_database()
+
 		with self.cluster.connection(user = 'test') as db:
-			db.execute(
-				"""
-CREATE USER md5 WITH
-	ENCRYPTED PASSWORD 'md5_password'
-;
-
--- crypt doesn't work with encrypted passwords:
--- http://www.postgresql.org/docs/8.2/interactive/auth-methods.html#AUTH-PASSWORD
-CREATE USER crypt WITH
-	UNENCRYPTED PASSWORD 'crypt_password'
-;
-
-CREATE USER password WITH
-	ENCRYPTED PASSWORD 'password_password'
-;
-
-CREATE USER trusted;
-				"""
-			)
+			db.execute(self.mk_common_users)
+			if self.check_crypt_user:
+				db.execute(self.mk_crypt_user)
 
 	def test_pg_open_SQL_ASCII(self):
 		# postgresql.open
@@ -364,7 +370,7 @@ def test_dbapi_connect(self):
 			MD5.cursor().execute, 'select 1'
 		)
 
-		if self.do_crypt:
+		if self.check_crypt_user:
 			CRYPT = dbapi20.connect(
 				user = 'crypt',
 				database = 'test',
@@ -449,7 +455,7 @@ def test_md5_connect(self):
 			self.assertEqual(c.prepare('select current_user').first(), 'md5')
 
 	def test_crypt_connect(self):
-		if self.do_crypt:
+		if self.check_crypt_user:
 			c = self.cluster.connection(
 				user = 'crypt',
 				password = 'crypt_password',
