NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc7578fa

committed

Fix some failures with connection tests on Windows hosts

The truncation of the log file, that this set of tests relies on to makesure that a connection attempt matches with its expected backend logpattern, fails, as reported by buildfarm member fairywren. Instead of atruncation, do a rotation of the log file and restart the node. Thiswill ensure that the connection attempt data is unique for each test.Discussion:https://postgr.es/m/YG05nCI8x8B+Ad3G@paquier.xyz

1 parente717a9a commitc7578faCopy full SHA for c7578fa

File tree

1 file changed

+22

-2

lines changed

src/test/perl
- PostgresNode.pm

1 file changed

+22

-2

lines changed

`‎src/test/perl/PostgresNode.pm`

Lines changed: 22 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1920,7 +1920,17 @@ sub connect_ok`
`1920`	`1920`	`if (@log_likeor@log_unlike)`
`1921`	`1921`	`{`
`1922`	`1922`	`# Don't let previous log entries match for this connection.`
`1923`		`-truncate$self->logfile, 0;`
	`1923`	`+# On Windows, the truncation would not work, so rotate the log`
	`1924`	`+# file before restarting the server afresh.`
	`1925`	`+if ($TestLib::windows_os)`
	`1926`	`+{`
	`1927`	`+$self->rotate_logfile;`
	`1928`	`+$self->restart;`
	`1929`	`+}`
	`1930`	`+else`
	`1931`	`+{`
	`1932`	`+truncate$self->logfile, 0;`
	`1933`	`+}`
`1924`	`1934`	`}`
`1925`	`1935`
`1926`	`1936`	`# Never prompt for a password, any callers of this routine should`
`@@ -1994,7 +2004,17 @@ sub connect_fails`
`1994`	`2004`	`if (@log_likeor@log_unlike)`
`1995`	`2005`	`{`
`1996`	`2006`	`# Don't let previous log entries match for this connection.`
`1997`		`-truncate$self->logfile, 0;`
	`2007`	`+# On Windows, the truncation would not work, so rotate the log`
	`2008`	`+# file before restarting the server afresh.`
	`2009`	`+if ($TestLib::windows_os)`
	`2010`	`+{`
	`2011`	`+$self->rotate_logfile;`
	`2012`	`+$self->restart;`
	`2013`	`+}`
	`2014`	`+else`
	`2015`	`+{`
	`2016`	`+truncate$self->logfile, 0;`
	`2017`	`+}`
`1998`	`2018`	`}`
`1999`	`2019`
`2000`	`2020`	`# Never prompt for a password, any callers of this routine should`

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!

Commitc7578fa

File tree

1 file changed

1 file changed

`‎src/test/perl/PostgresNode.pm`

0 commit comments