mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some failures with connection tests on Windows hosts

Browse Source 
The truncation of the log file, that this set of tests relies on to make
sure that a connection attempt matches with its expected backend log
pattern, fails, as reported by buildfarm member fairywren.  Instead of a
truncation, do a rotation of the log file and restart the node.  This
will ensure that the connection attempt data is unique for each test.

Discussion: https://postgr.es/m/YG05nCI8x8B+Ad3G@paquier.xyz
This commit is contained in:
Michael Paquier 2021-04-08 06:55:00 +09:00
parent e717a9a18b
commit c7578fa640
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/perl/PostgresNode.pm
View File

@ -1920,7 +1920,17 @@ sub connect_ok
if (@log_like or @log_unlike) if (@log_like or @log_unlike)
{ {
# Don't let previous log entries match for this connection. # Don't let previous log entries match for this connection.
truncate $self->logfile, 0; # On Windows, the truncation would not work, so rotate the log
# file before restarting the server afresh.
if ($TestLib::windows_os)
{
$self->rotate_logfile;
$self->restart;
}
else
{
truncate $self->logfile, 0;
}
} }
# Never prompt for a password, any callers of this routine should # Never prompt for a password, any callers of this routine should
@ -1994,7 +2004,17 @@ sub connect_fails
if (@log_like or @log_unlike) if (@log_like or @log_unlike)
{ {
# Don't let previous log entries match for this connection. # Don't let previous log entries match for this connection.
truncate $self->logfile, 0; # On Windows, the truncation would not work, so rotate the log
# file before restarting the server afresh.
if ($TestLib::windows_os)
{
$self->rotate_logfile;
$self->restart;
}
else
{
truncate $self->logfile, 0;
}
} }
# Never prompt for a password, any callers of this routine should # Never prompt for a password, any callers of this routine should