Skip to content

Commit 3a1a422

Browse files
committed
Fix timeouts in PostgresNode::psql
Newer Perl or IPC::Run versions default to appending the filename to string exceptions, e.g. the exception psql timed out is thrown as psql timed out at /usr/share/perl5/vendor_perl/IPC/Run.pm line 2961. To handle this, match exceptions with !~ rather than ne. From: Craig Ringer <craig@2ndquadrant.com> Reviewed-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
1 parent 965956a commit 3a1a422

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/test/perl/PostgresNode.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ sub psql
11161116
# IPC::Run::run threw an exception. re-throw unless it's a
11171117
# timeout, which we'll handle by testing is_expired
11181118
die $exc_save
1119-
if (blessed($exc_save) || $exc_save ne $timeout_exception);
1119+
if (blessed($exc_save) || $exc_save !~ /^\Q$timeout_exception\E/);
11201120

11211121
$ret = undef;
11221122

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy