From ccb0bd36619f03055382205eddd7a0e9b64bba95 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 20 Jun 2024 15:49:05 +0300 Subject: [PATCH v2 1/2] tests: Trim newline from result returned by BackgroundPsql->query This went unnoticed, because only a few existing callers of BackgroundPsql->query used the result, and the ones that did were not bothered by an extra newline. I noticed because I was about to add a new test that checks the result. --- src/test/perl/PostgreSQL/Test/BackgroundPsql.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm b/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm index 4091c311b8..041b3dfa7d 100644 --- a/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm +++ b/src/test/perl/PostgreSQL/Test/BackgroundPsql.pm @@ -217,13 +217,13 @@ sub query my $banner = "background_psql: QUERY_SEPARATOR"; $self->{stdin} .= "$query\n;\n\\echo $banner\n"; - pump_until($self->{run}, $self->{timeout}, \$self->{stdout}, qr/$banner/); + pump_until($self->{run}, $self->{timeout}, \$self->{stdout}, qr/$banner\n/); die "psql query timed out" if $self->{timeout}->is_expired; $output = $self->{stdout}; # remove banner again, our caller doesn't care - $output =~ s/\n$banner$//s; + $output =~ s/\n$banner\n$//s; # clear out output for the next query $self->{stdout} = ''; -- 2.39.2