rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to make crash restart test work on windows. 

Author: Andres Freund
Tested-By: Andrew Dunstan
Discussion: https://postgr.es/m/20170930224424.ud5ilchmclbl5y5n@alap3.anarazel.de
This commit is contained in:
Andres Freund 2017-10-01 15:21:45 -07:00
parent 2e83db3ad2
commit 784905795f
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/test/recovery/t/013_crash_restart.pl
View File

@ -16,16 +16,8 @@ use Test::More;
use Config; use Config;
use Time::HiRes qw(usleep); use Time::HiRes qw(usleep);
if ($Config{osname} eq 'MSWin32') plan tests => 18;
{
# some Windows Perls at least don't like IPC::Run's
# start/kill_kill regime.
plan skip_all => "Test fails on Windows perl";
}
else
{
plan tests => 18;
}
# To avoid hanging while expecting some specific input from a psql # To avoid hanging while expecting some specific input from a psql
# instance being driven by us, add a timeout high enough that it # instance being driven by us, add a timeout high enough that it
@ -106,10 +98,10 @@ $monitor_stdout = '';
$monitor_stderr = ''; $monitor_stderr = '';
# kill once with QUIT - we expect psql to exit, while emitting error message first # kill once with QUIT - we expect psql to exit, while emitting error message first
my $cnt = kill 'QUIT', $pid; my $ret = TestLib::system_log('pg_ctl', 'kill', 'QUIT', $pid);
# Exactly process should have been alive to be killed # Exactly process should have been alive to be killed
is($cnt, 1, "exactly one process killed with SIGQUIT"); is($ret, 0, "killed process with SIGQUIT");
# Check that psql sees the killed backend as having been terminated # Check that psql sees the killed backend as having been terminated
$killme_stdin .= q[ $killme_stdin .= q[
@ -119,14 +111,14 @@ ok(pump_until($killme, \$killme_stderr, qr/WARNING: terminating connection beca
"psql query died successfully after SIGQUIT"); "psql query died successfully after SIGQUIT");
$killme_stderr = ''; $killme_stderr = '';
$killme_stdout = ''; $killme_stdout = '';
$killme->kill_kill; $killme->finish;
# Wait till server restarts - we should get the WARNING here, but # Wait till server restarts - we should get the WARNING here, but
# sometimes the server is unable to send that, if interrupted while # sometimes the server is unable to send that, if interrupted while
# sending. # sending.
ok(pump_until($monitor, \$monitor_stderr, qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly/m), ok(pump_until($monitor, \$monitor_stderr, qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly/m),
"psql monitor died successfully after SIGQUIT"); "psql monitor died successfully after SIGQUIT");
$monitor->kill_kill; $monitor->finish;
# Wait till server restarts # Wait till server restarts
is($node->poll_query_until('postgres', 'SELECT $$restarted after sigquit$$;', 'restarted after sigquit'), is($node->poll_query_until('postgres', 'SELECT $$restarted after sigquit$$;', 'restarted after sigquit'),
@ -179,8 +171,8 @@ $monitor_stderr = '';
# kill with SIGKILL this time - we expect the backend to exit, without # kill with SIGKILL this time - we expect the backend to exit, without
# being able to emit an error error message # being able to emit an error error message
$cnt = kill 'KILL', $pid; $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
is($cnt, 1, "exactly one process killed with KILL"); is($ret, 0, "killed process with KILL");
# Check that psql sees the server as being terminated. No WARNING, # Check that psql sees the server as being terminated. No WARNING,
# because signal handlers aren't being run on SIGKILL. # because signal handlers aren't being run on SIGKILL.
@ -189,14 +181,14 @@ SELECT 1;
]; ];
ok(pump_until($killme, \$killme_stderr, qr/server closed the connection unexpectedly/m), ok(pump_until($killme, \$killme_stderr, qr/server closed the connection unexpectedly/m),
"psql query died successfully after SIGKILL"); "psql query died successfully after SIGKILL");
$killme->kill_kill; $killme->finish;
# Wait till server restarts - we should get the WARNING here, but # Wait till server restarts - we should get the WARNING here, but
# sometimes the server is unable to send that, if interrupted while # sometimes the server is unable to send that, if interrupted while
# sending. # sending.
ok(pump_until($monitor, \$monitor_stderr, qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly/m), ok(pump_until($monitor, \$monitor_stderr, qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly/m),
"psql monitor died successfully after SIGKILL"); "psql monitor died successfully after SIGKILL");
$monitor->kill_kill; $monitor->finish;
# Wait till server restarts # Wait till server restarts
is($node->poll_query_until('postgres', 'SELECT 1', '1'), "1", "reconnected after SIGKILL"); is($node->poll_query_until('postgres', 'SELECT 1', '1'), "1", "reconnected after SIGKILL");