From 7a43a1fc52d0fefdcb008f2fc460ab46f242da69 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 4 Apr 2022 22:10:06 -0400 Subject: [PATCH] Update some tests in 013_crash_restart.pl. The expected backend message after SIGQUIT changed in commit 7e784d1dc, but we missed updating this test case. Also, experience shows that we might sometimes get "could not send data to server" instead of either of the libpq messages the test is looking for. Per report from Mark Dilger. Back-patch to v14 where the backend message changed. Discussion: https://postgr.es/m/17BD82D7-49AC-40C9-8204-E7ADD30321A0@enterprisedb.com --- src/test/recovery/t/013_crash_restart.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/recovery/t/013_crash_restart.pl b/src/test/recovery/t/013_crash_restart.pl index 8807c0a2919..10da6cb0c1c 100644 --- a/src/test/recovery/t/013_crash_restart.pl +++ b/src/test/recovery/t/013_crash_restart.pl @@ -110,7 +110,7 @@ ok( pump_until( $killme, $psql_timeout, \$killme_stderr, - qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost/m + qr/WARNING: terminating connection because of unexpected SIGQUIT signal|server closed the connection unexpectedly|connection to server was lost|could not send data to server/m ), "psql query died successfully after SIGQUIT"); $killme_stderr = ''; @@ -124,7 +124,7 @@ ok( pump_until( $monitor, $psql_timeout, \$monitor_stderr, - qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost/m + qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost|could not send data to server/m ), "psql monitor died successfully after SIGQUIT"); $monitor->finish; @@ -190,7 +190,7 @@ ok( pump_until( $killme, $psql_timeout, \$killme_stderr, - qr/server closed the connection unexpectedly|connection to server was lost/m + qr/server closed the connection unexpectedly|connection to server was lost|could not send data to server/m ), "psql query died successfully after SIGKILL"); $killme->finish; @@ -202,7 +202,7 @@ ok( pump_until( $monitor, $psql_timeout, \$monitor_stderr, - qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost/m + qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost|could not send data to server/m ), "psql monitor died successfully after SIGKILL"); $monitor->finish;