Content-Length: 5563 | pFad | http://github.com/postgrespro/testgres/pull/172.patch

thub.com From 0139bbd858d1fe4bf6566ff6c3e633c32b592063 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalenko Date: Wed, 25 Dec 2024 16:57:42 +0300 Subject: [PATCH 1/3] [windows] TestgresTests is updated - test_the_same_port - test_port_rereserve_during_node_start - test_port_conflict - use rm_carriage_returns --- tests/test_simple.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_simple.py b/tests/test_simple.py index 9cf29c64..8148d05d 100644 --- a/tests/test_simple.py +++ b/tests/test_simple.py @@ -1054,7 +1054,7 @@ def test_the_same_port(self): self.assertTrue(node._should_free_port) self.assertEqual(type(node.port), int) node_port_copy = node.port - self.assertEqual(node.safe_psql("SELECT 1;"), b'1\n') + self.assertEqual(rm_carriage_returns(node.safe_psql("SELECT 1;")), b'1\n') with get_new_node(port=node.port) as node2: self.assertEqual(type(node2.port), int) @@ -1069,7 +1069,7 @@ def test_the_same_port(self): # node is still working self.assertEqual(node.port, node_port_copy) self.assertTrue(node._should_free_port) - self.assertEqual(node.safe_psql("SELECT 3;"), b'3\n') + self.assertEqual(rm_carriage_returns(node.safe_psql("SELECT 3;")), b'3\n') class tagPortManagerProxy: sm_prev_testgres_reserve_port = None @@ -1175,7 +1175,7 @@ def test_port_rereserve_during_node_start(self): self.assertTrue(node1._should_free_port) self.assertEqual(type(node1.port), int) # noqa: E721 node1_port_copy = node1.port - self.assertEqual(node1.safe_psql("SELECT 1;"), b'1\n') + self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 1;")), b'1\n') with __class__.tagPortManagerProxy(node1.port, C_COUNT_OF_BAD_PORT_USAGE): assert __class__.tagPortManagerProxy.sm_DummyPortNumber == node1.port @@ -1191,12 +1191,12 @@ def test_port_rereserve_during_node_start(self): self.assertEqual(__class__.tagPortManagerProxy.sm_DummyPortTotalUsage, C_COUNT_OF_BAD_PORT_USAGE) self.assertTrue(node2.is_started) - self.assertEqual(node2.safe_psql("SELECT 2;"), b'2\n') + self.assertEqual(rm_carriage_returns(node2.safe_psql("SELECT 2;")), b'2\n') # node1 is still working self.assertEqual(node1.port, node1_port_copy) self.assertTrue(node1._should_free_port) - self.assertEqual(node1.safe_psql("SELECT 3;"), b'3\n') + self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 3;")), b'3\n') def test_port_conflict(self): assert testgres.PostgresNode._C_MAX_START_ATEMPTS > 1 @@ -1208,7 +1208,7 @@ def test_port_conflict(self): self.assertTrue(node1._should_free_port) self.assertEqual(type(node1.port), int) # noqa: E721 node1_port_copy = node1.port - self.assertEqual(node1.safe_psql("SELECT 1;"), b'1\n') + self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 1;")), b'1\n') with __class__.tagPortManagerProxy(node1.port, C_COUNT_OF_BAD_PORT_USAGE): assert __class__.tagPortManagerProxy.sm_DummyPortNumber == node1.port @@ -1233,7 +1233,7 @@ def test_port_conflict(self): # node1 is still working self.assertEqual(node1.port, node1_port_copy) self.assertTrue(node1._should_free_port) - self.assertEqual(node1.safe_psql("SELECT 3;"), b'3\n') + self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 3;")), b'3\n') def test_simple_with_bin_dir(self): with get_new_node() as node: From 660ab62d96cda35d19ac69db556a986e4a241297 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalenko Date: Wed, 25 Dec 2024 16:59:44 +0300 Subject: [PATCH 2/3] [windows] PostgresNode.start (LOCAL__start_node) is corrected [BUG FIX] execute_utility may return None in error. --- testgres/node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testgres/node.py b/testgres/node.py index 3d023399..baf532de 100644 --- a/testgres/node.py +++ b/testgres/node.py @@ -792,7 +792,7 @@ def start(self, params=[], wait=True): def LOCAL__start_node(): _, _, error = execute_utility(_params, self.utils_log_file, verbose=True) - assert type(error) == str # noqa: E721 + assert error is None or type(error) == str # noqa: E721 if error and 'does not exist' in error: raise Exception(error) From 6465b4183f63d82edbbb24ab9a41fa36da551185 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Wed, 25 Dec 2024 17:34:35 +0300 Subject: [PATCH 3/3] A comment is added --- testgres/node.py | 1 + 1 file changed, 1 insertion(+) diff --git a/testgres/node.py b/testgres/node.py index baf532de..e203bb7d 100644 --- a/testgres/node.py +++ b/testgres/node.py @@ -791,6 +791,7 @@ def start(self, params=[], wait=True): "start"] + params # yapf: disable def LOCAL__start_node(): + # 'error' will be None on Windows _, _, error = execute_utility(_params, self.utils_log_file, verbose=True) assert error is None or type(error) == str # noqa: E721 if error and 'does not exist' in error:

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!