Skip to content

Commit 677271a

Browse files
committed
Unbreak recovery test on Windows
On Windows we need to send explicit quit messages to psql or the TAP tests can hang.
1 parent 9fb9691 commit 677271a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/test/recovery/t/022_crash_temp_files.pl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ BEGIN
124124
my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
125125
is($ret, 0, 'killed process with KILL');
126126

127-
# Close psql session
127+
# Explicitly shut down psql gracefully - to avoid hangs or worse on windows
128+
$killme_stdin .= "\\q\n";
128129
$killme->finish;
130+
$killme_stdin2 .= "\\q\n";
129131
$killme2->finish;
130132

131133
# Wait till server restarts
@@ -212,8 +214,10 @@ BEGIN
212214
$ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
213215
is($ret, 0, 'killed process with KILL');
214216

215-
# Close psql session
217+
# Explicitly shut down psql gracefully - to avoid hangs or worse on windows
218+
$killme_stdin .= "\\q\n";
216219
$killme->finish;
220+
$killme_stdin2 .= "\\q\n";
217221
$killme2->finish;
218222

219223
# Wait till server restarts

0 commit comments

Comments
 (0)