postgres.git / summary / log / commit / refs

commit    3a1a422fa57a193f5dda93ea1b7941fdac42ac96
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Wed Mar 01 18:52:38 2017 +0000
First released in: 10.0, 9.6.3

    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>


src/test/perl/PostgresNode.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm index 9b712ebf306..bd627b29dee 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -1116,7 +1116,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; [parent: 965956a03305]