NotificationsYou must be signed in to change notification settings
Fork37
Star150

Commit989e209

authored

Merge pull request#172 from dmitry-lipetsk/D20241225__003--windows

Problems with Windows are fixed

2 parents155f6c8 +6465b41 commit989e209Copy full SHA for 989e209

File tree

2 files changed

-8

lines changed

testgres
- node.py
tests
- test_simple.py

2 files changed

-8

lines changed

`‎testgres/node.py‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -791,8 +791,9 @@ def start(self, params=[], wait=True):`
`791`	`791`	`"start"]+params# yapf: disable`
`792`	`792`
`793`	`793`	`defLOCAL__start_node():`
	`794`	`+# 'error' will be None on Windows`
`794`	`795`	`_,_,error=execute_utility(_params,self.utils_log_file,verbose=True)`
`795`		`-asserttype(error)==str# noqa: E721`
	`796`	`+asserterrorisNoneortype(error)==str# noqa: E721`
`796`	`797`	`iferrorand'does not exist'inerror:`
`797`	`798`	`raiseException(error)`
`798`	`799`

`‎tests/test_simple.py‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ def test_the_same_port(self):`
`1054`	`1054`	`self.assertTrue(node._should_free_port)`
`1055`	`1055`	`self.assertEqual(type(node.port),int)`
`1056`	`1056`	`node_port_copy=node.port`
`1057`		`-self.assertEqual(node.safe_psql("SELECT 1;"),b'1\n')`
	`1057`	`+self.assertEqual(rm_carriage_returns(node.safe_psql("SELECT 1;")),b'1\n')`
`1058`	`1058`
`1059`	`1059`	`withget_new_node(port=node.port)asnode2:`
`1060`	`1060`	`self.assertEqual(type(node2.port),int)`
`@@ -1069,7 +1069,7 @@ def test_the_same_port(self):`
`1069`	`1069`	`# node is still working`
`1070`	`1070`	`self.assertEqual(node.port,node_port_copy)`
`1071`	`1071`	`self.assertTrue(node._should_free_port)`
`1072`		`-self.assertEqual(node.safe_psql("SELECT 3;"),b'3\n')`
	`1072`	`+self.assertEqual(rm_carriage_returns(node.safe_psql("SELECT 3;")),b'3\n')`
`1073`	`1073`
`1074`	`1074`	`classtagPortManagerProxy:`
`1075`	`1075`	`sm_prev_testgres_reserve_port=None`
`@@ -1175,7 +1175,7 @@ def test_port_rereserve_during_node_start(self):`
`1175`	`1175`	`self.assertTrue(node1._should_free_port)`
`1176`	`1176`	`self.assertEqual(type(node1.port),int)# noqa: E721`
`1177`	`1177`	`node1_port_copy=node1.port`
`1178`		`-self.assertEqual(node1.safe_psql("SELECT 1;"),b'1\n')`
	`1178`	`+self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 1;")),b'1\n')`
`1179`	`1179`
`1180`	`1180`	`with__class__.tagPortManagerProxy(node1.port,C_COUNT_OF_BAD_PORT_USAGE):`
`1181`	`1181`	`assert__class__.tagPortManagerProxy.sm_DummyPortNumber==node1.port`
`@@ -1191,12 +1191,12 @@ def test_port_rereserve_during_node_start(self):`
`1191`	`1191`	`self.assertEqual(__class__.tagPortManagerProxy.sm_DummyPortTotalUsage,C_COUNT_OF_BAD_PORT_USAGE)`
`1192`	`1192`	`self.assertTrue(node2.is_started)`
`1193`	`1193`
`1194`		`-self.assertEqual(node2.safe_psql("SELECT 2;"),b'2\n')`
	`1194`	`+self.assertEqual(rm_carriage_returns(node2.safe_psql("SELECT 2;")),b'2\n')`
`1195`	`1195`
`1196`	`1196`	`# node1 is still working`
`1197`	`1197`	`self.assertEqual(node1.port,node1_port_copy)`
`1198`	`1198`	`self.assertTrue(node1._should_free_port)`
`1199`		`-self.assertEqual(node1.safe_psql("SELECT 3;"),b'3\n')`
	`1199`	`+self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 3;")),b'3\n')`
`1200`	`1200`
`1201`	`1201`	`deftest_port_conflict(self):`
`1202`	`1202`	`asserttestgres.PostgresNode._C_MAX_START_ATEMPTS>1`
`@@ -1208,7 +1208,7 @@ def test_port_conflict(self):`
`1208`	`1208`	`self.assertTrue(node1._should_free_port)`
`1209`	`1209`	`self.assertEqual(type(node1.port),int)# noqa: E721`
`1210`	`1210`	`node1_port_copy=node1.port`
`1211`		`-self.assertEqual(node1.safe_psql("SELECT 1;"),b'1\n')`
	`1211`	`+self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 1;")),b'1\n')`
`1212`	`1212`
`1213`	`1213`	`with__class__.tagPortManagerProxy(node1.port,C_COUNT_OF_BAD_PORT_USAGE):`
`1214`	`1214`	`assert__class__.tagPortManagerProxy.sm_DummyPortNumber==node1.port`
`@@ -1233,7 +1233,7 @@ def test_port_conflict(self):`
`1233`	`1233`	`# node1 is still working`
`1234`	`1234`	`self.assertEqual(node1.port,node1_port_copy)`
`1235`	`1235`	`self.assertTrue(node1._should_free_port)`
`1236`		`-self.assertEqual(node1.safe_psql("SELECT 3;"),b'3\n')`
	`1236`	`+self.assertEqual(rm_carriage_returns(node1.safe_psql("SELECT 3;")),b'3\n')`
`1237`	`1237`
`1238`	`1238`	`deftest_simple_with_bin_dir(self):`
`1239`	`1239`	`withget_new_node()asnode:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit989e209

File tree

2 files changed

2 files changed

`‎testgres/node.py‎`

`‎tests/test_simple.py‎`

0 commit comments