From aa587e7cedd92d60e93075d643cb8ad93ca07c5b Mon Sep 17 00:00:00 2001 From: Vignesh C Date: Sat, 27 May 2023 05:36:34 +0530 Subject: [PATCH v2 2/2] Move common connection log content verification code to a common function. Move common connection log content verification code to a common function. --- src/test/perl/PostgreSQL/Test/Cluster.pm | 122 +++++++++++------------ 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index f10e44ba51..7458406ee6 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -2168,21 +2168,19 @@ sub pgbench =pod -=item $node->connect_ok($connstr, $test_name, %params) +=item $node->check_connect_log_contents($offset, $test_name, %parameters) -Attempt a connection with a custom connection string. This is expected -to succeed. +Check connection log contents. =over -=item sql => B +=item $test_name -If this parameter is set, this query is used for the connection attempt -instead of the default. +Name of test for error messages. -=item expected_stdout => B +=item $offset -If this regular expression is set, matches it with the output generated. +Offset of the log file. =item log_like => [ qr/required message/ ] @@ -2200,6 +2198,58 @@ passed to C. =cut +sub check_connect_log_contents +{ + my ($self, $test_name, $offset, %params) = @_; + + my (@log_like, @log_unlike); + if (defined($params{log_like})) + { + @log_like = @{ $params{log_like} }; + } + if (defined($params{log_unlike})) + { + @log_unlike = @{ $params{log_unlike} }; + } + + if (@log_like or @log_unlike) + { + my $log_contents = + PostgreSQL::Test::Utils::slurp_file($self->logfile, $offset); + + while (my $regex = shift @log_like) + { + like($log_contents, $regex, "$test_name: log matches"); + } + while (my $regex = shift @log_unlike) + { + unlike($log_contents, $regex, "$test_name: log does not match"); + } + } +} + +=pod + +=item $node->connect_ok($connstr, $test_name, %params) + +Attempt a connection with a custom connection string. This is expected +to succeed. + +=over + +=item sql => B + +If this parameter is set, this query is used for the connection attempt +instead of the default. + +=item expected_stdout => B + +If this regular expression is set, matches it with the output generated. + +=back + +=cut + sub connect_ok { local $Test::Builder::Level = $Test::Builder::Level + 1; @@ -2215,16 +2265,6 @@ sub connect_ok $sql = "SELECT \$\$connected with $connstr\$\$"; } - my (@log_like, @log_unlike); - if (defined($params{log_like})) - { - @log_like = @{ $params{log_like} }; - } - if (defined($params{log_unlike})) - { - @log_unlike = @{ $params{log_unlike} }; - } - my $log_location = -s $self->logfile; # Never prompt for a password, any callers of this routine should @@ -2245,20 +2285,7 @@ sub connect_ok is($stderr, "", "$test_name: no stderr"); - if (@log_like or @log_unlike) - { - my $log_contents = - PostgreSQL::Test::Utils::slurp_file($self->logfile, $log_location); - - while (my $regex = shift @log_like) - { - like($log_contents, $regex, "$test_name: log matches"); - } - while (my $regex = shift @log_unlike) - { - unlike($log_contents, $regex, "$test_name: log does not match"); - } - } + $self->check_connect_log_contents($test_name, $log_location, %params); } =pod @@ -2274,12 +2301,6 @@ to fail. If this regular expression is set, matches it with the output generated. -=item log_like => [ qr/required message/ ] - -=item log_unlike => [ qr/prohibited message/ ] - -See C, above. - =back =cut @@ -2289,16 +2310,6 @@ sub connect_fails local $Test::Builder::Level = $Test::Builder::Level + 1; my ($self, $connstr, $test_name, %params) = @_; - my (@log_like, @log_unlike); - if (defined($params{log_like})) - { - @log_like = @{ $params{log_like} }; - } - if (defined($params{log_unlike})) - { - @log_unlike = @{ $params{log_unlike} }; - } - my $log_location = -s $self->logfile; # Never prompt for a password, any callers of this routine should @@ -2316,20 +2327,7 @@ sub connect_fails like($stderr, $params{expected_stderr}, "$test_name: matches"); } - if (@log_like or @log_unlike) - { - my $log_contents = - PostgreSQL::Test::Utils::slurp_file($self->logfile, $log_location); - - while (my $regex = shift @log_like) - { - like($log_contents, $regex, "$test_name: log matches"); - } - while (my $regex = shift @log_unlike) - { - unlike($log_contents, $regex, "$test_name: log does not match"); - } - } + $self->check_connect_log_contents($test_name, $log_location, %params); } =pod -- 2.34.1