Commitd9afdcc

committed

Merge commit 'de738f9fd8d52345677903bface575d41cbe539c' into D20250223_001--pytest

2 parents842bc08 +de738f9 commitd9afdccCopy full SHA for d9afdcc

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 2 deletions

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)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ def test_init__unk_LANG_and_LC_CTYPE(self):`
`195`	`195`	`assert"LC_CTYPE"inerrMsg`
`196`	`196`	`assertunkData[1]inerrMsg`
`197`	`197`	`assert"warning: setlocale: LC_CTYPE: cannot change locale ("+unkData[1]+"): No such file or directory"inerrMsg`
`198`		`-assert"postgres"inerrMsg`
	`198`	`+assert("postgres"inerrMsg)or ("PostgreSQL"inerrMsg)`
`199`	`199`	`break`
`200`	`200`	`raiseException("We expected an error!")`
`201`	`201`	`finally:`

Comments

(0)