Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
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

+1-1
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)