Commit c7578fa6 authored by Michael Paquier's avatar Michael Paquier

Fix some failures with connection tests on Windows hosts

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
parent e717a9a1
...@@ -1920,7 +1920,17 @@ sub connect_ok ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment