Commit 677271a3 authored by Andrew Dunstan's avatar Andrew Dunstan

Unbreak recovery test on Windows

On Windows we need to send explicit quit messages to psql or the TAP tests
can hang.
parent 9fb9691a
...@@ -124,8 +124,10 @@ $killme_stderr2 = ''; ...@@ -124,8 +124,10 @@ $killme_stderr2 = '';
my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid); my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
is($ret, 0, 'killed process with KILL'); 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->finish;
$killme_stdin2 .= "\\q\n";
$killme2->finish; $killme2->finish;
# Wait till server restarts # Wait till server restarts
...@@ -212,8 +214,10 @@ $killme_stderr2 = ''; ...@@ -212,8 +214,10 @@ $killme_stderr2 = '';
$ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid); $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
is($ret, 0, 'killed process with KILL'); 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->finish;
$killme_stdin2 .= "\\q\n";
$killme2->finish; $killme2->finish;
# Wait till server restarts # Wait till server restarts
......
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