From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 1 Mar 2017 18:52:38 +0000 (-0500)
Subject: Fix timeouts in PostgresNode::psql
X-Git-Tag: REL_10_BETA1~804
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=231f48796bcf2976f19122b8c6e12f50b463f94e;p=thirdparty%2Fpostgresql.git

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>
---

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 4018f0af1fc..e5cb348f4c8 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -1139,7 +1139,7 @@ sub psql
 			# IPC::Run::run threw an exception. re-throw unless it's a
 			# timeout, which we'll handle by testing is_expired
 			die $exc_save
-			  if (blessed($exc_save) || $exc_save ne $timeout_exception);
+			  if (blessed($exc_save) || $exc_save !~ /^\Q$timeout_exception\E/);
 
 			$ret = undef;