diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2021-03-21 15:04:45 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2021-03-21 15:12:03 -0400 |
| commit | ef823873840c9f341239e18633bdb0116d8d2738 (patch) | |
| tree | 321e040c20e40271cce71e81e4df7b3a47cb4355 /src | |
| parent | 2b526ed2e1cbaa54e5ad0c12d1294482f2757b17 (diff) | |
| download | postgresql-ef823873840c9f341239e18633bdb0116d8d2738.tar.gz postgresql-ef823873840c9f341239e18633bdb0116d8d2738.zip | |
Don't run recover crash_temp_files test in Windows perl
This reverts commit 677271a3a125e294b33b891669f594a2c8cb36ce.
"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
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/recovery/t/022_crash_temp_files.pl | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/test/recovery/t/022_crash_temp_files.pl b/src/test/recovery/t/022_crash_temp_files.pl index 03c8ae3bd71..41d8b74911f 100644 --- a/src/test/recovery/t/022_crash_temp_files.pl +++ b/src/test/recovery/t/022_crash_temp_files.pl @@ -6,7 +6,15 @@ use TestLib; use Test::More; 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 @@ -124,10 +132,8 @@ $killme_stderr2 = ''; my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid); is($ret, 0, 'killed process with KILL'); -# Explicitly shut down psql gracefully - to avoid hangs or worse on windows -$killme_stdin .= "\\q\n"; +# Close psql session $killme->finish; -$killme_stdin2 .= "\\q\n"; $killme2->finish; # Wait till server restarts @@ -214,10 +220,8 @@ $killme_stderr2 = ''; $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid); is($ret, 0, 'killed process with KILL'); -# Explicitly shut down psql gracefully - to avoid hangs or worse on windows -$killme_stdin .= "\\q\n"; +# Close psql session $killme->finish; -$killme_stdin2 .= "\\q\n"; $killme2->finish; # Wait till server restarts |