Commit ef823873 authored by Andrew Dunstan's avatar Andrew Dunstan

Don't run recover crash_temp_files test in Windows perl

This reverts commit 677271a3.
"Unbreak recovery test on Windows"

The test hangs on Windows, and attempts to remedy the problem have
proved fragile at best. So we simply disable the test on Windows perl.
(Msys perl seems perfectly happy).

Discussion: https://postgr.es/m/5b748470-7335-5439-e876-6a88c951e1c5@dunslane.net
parent 2b526ed2
...@@ -6,7 +6,15 @@ use TestLib; ...@@ -6,7 +6,15 @@ use TestLib;
use Test::More; use Test::More;
use Config; use Config;
plan tests => 9; if ($Config{osname} eq 'MSWin32')
{
plan skip_all => 'tests hang on Windows';
exit;
}
else
{
plan tests => 9;
}
# To avoid hanging while expecting some specific input from a psql # To avoid hanging while expecting some specific input from a psql
...@@ -124,10 +132,8 @@ $killme_stderr2 = ''; ...@@ -124,10 +132,8 @@ $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');
# Explicitly shut down psql gracefully - to avoid hangs or worse on windows # Close psql session
$killme_stdin .= "\\q\n";
$killme->finish; $killme->finish;
$killme_stdin2 .= "\\q\n";
$killme2->finish; $killme2->finish;
# Wait till server restarts # Wait till server restarts
...@@ -214,10 +220,8 @@ $killme_stderr2 = ''; ...@@ -214,10 +220,8 @@ $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');
# Explicitly shut down psql gracefully - to avoid hangs or worse on windows # Close psql session
$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