Merge commit 'de738f9fd8d52345677903bface575d41cbe539c' into D20250223_001--pytest

dmitry-lipetsk · dmitry-lipetsk · commit d9afdcc503c3 · 2025-02-24T16:15:50.000+03:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -841,8 +841,7 @@ def LOCAL__raise_cannot_start_node__std(from_exception):
 
                     log_files0 = log_files1
                     logging.warning(
-                        "Detected a conflict with using the port {0}. "
-                        "Trying another port after a {1}-second sleep...".format(self.port, timeout)
+                        "Detected a conflict with using the port {0}. Trying another port after a {1}-second sleep...".format(self.port, timeout)
                     )
                     time.sleep(timeout)
                     timeout = min(2 * timeout, 5)
diff --git a/tests/test_simple_remote.py b/tests/test_simple_remote.py
@@ -195,7 +195,7 @@ def test_init__unk_LANG_and_LC_CTYPE(self):
                         assert "LC_CTYPE" in errMsg
                         assert unkData[1] in errMsg
                         assert "warning: setlocale: LC_CTYPE: cannot change locale (" + unkData[1] + "): No such file or directory" in errMsg
-                        assert "postgres" in errMsg
+                        assert ("postgres" in errMsg) or ("PostgreSQL" in errMsg)
                         break
                     raise Exception("We expected an error!")
         finally:

Original file line number	Diff line number	Diff line change
`@@ -841,8 +841,7 @@ def LOCAL__raise_cannot_start_node__std(from_exception):`
`841`	`841`
`842`	`842`	`log_files0 = log_files1`
`843`	`843`	`logging.warning(`
`844`		`- "Detected a conflict with using the port {0}. "`
`845`		`- "Trying another port after a {1}-second sleep...".format(self.port, timeout)`
	`844`	`+ "Detected a conflict with using the port {0}. Trying another port after a {1}-second sleep...".format(self.port, timeout)`
`846`	`845`	`)`
`847`	`846`	`time.sleep(timeout)`
`848`	`847`	`timeout = min(2 * timeout, 5)`