From 677271a3a125e294b33b891669f594a2c8cb36ce Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sun, 21 Mar 2021 11:52:30 -0400 Subject: [PATCH] Unbreak recovery test on Windows On Windows we need to send explicit quit messages to psql or the TAP tests can hang. --- src/test/recovery/t/022_crash_temp_files.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/recovery/t/022_crash_temp_files.pl b/src/test/recovery/t/022_crash_temp_files.pl index c5624fe8644..03c8ae3bd71 100644 --- a/src/test/recovery/t/022_crash_temp_files.pl +++ b/src/test/recovery/t/022_crash_temp_files.pl @@ -124,8 +124,10 @@ $killme_stderr2 = ''; my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid); is($ret, 0, 'killed process with KILL'); -# Close psql session +# Explicitly shut down psql gracefully - to avoid hangs or worse on windows +$killme_stdin .= "\\q\n"; $killme->finish; +$killme_stdin2 .= "\\q\n"; $killme2->finish; # Wait till server restarts @@ -212,8 +214,10 @@ $killme_stderr2 = ''; $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid); is($ret, 0, 'killed process with KILL'); -# Close psql session +# Explicitly shut down psql gracefully - to avoid hangs or worse on windows +$killme_stdin .= "\\q\n"; $killme->finish; +$killme_stdin2 .= "\\q\n"; $killme2->finish; # Wait till server restarts -- 2.39.5