diff options
author | Michael Paquier <michael@paquier.xyz> | 2023-06-09 11:56:27 +0900 |
---|---|---|
committer | Michael Paquier <michael@paquier.xyz> | 2023-06-09 11:56:27 +0900 |
commit | 392ea0c78fdb6cb92f1af0793f6c2d48526e6fed (patch) | |
tree | 8dde0c244ab62a3c4d61a02c31f1484455266455 /src/test/perl/PostgreSQL/Test/Cluster.pm | |
parent | a83edeaf684a70da02fa2bce8b7e3aefa3f906f5 (diff) | |
download | postgresql-392ea0c78fdb6cb92f1af0793f6c2d48526e6fed.tar.gz postgresql-392ea0c78fdb6cb92f1af0793f6c2d48526e6fed.zip |
Refactor routine to find single log content pattern in TAP tests
The same routine to check if a specific pattern can be found in the
server logs was copied over four different test scripts. This refactors
the whole to use a single routine located in PostgreSQL::Test::Cluster,
named log_contains, to grab the contents of the server logs and check
for a specific pattern.
On HEAD, the code previously used assumed that slurp_file() could not
handle an undefined offset, setting it to zero, but slurp_file() does
do an extra fseek() before retrieving the log contents only if an offset
is defined. In two places, the test was retrieving the full log
contents with slurp_file() after calling substr() to apply an offset,
ignoring that slurp_file() would be able to handle that.
Backpatch all the way down to ease the introduction of new tests that
could rely on the new routine.
Author: Vignesh C
Reviewed-by: Andrew Dunstan, Dagfinn Ilmari Mannsåker, Michael Paquier
Discussion: https://postgr.es/m/CALDaNm0YSiLpjCmajwLfidQrFOrLNKPQir7s__PeVvh9U3uoTQ@mail.gmail.com
Backpatch-through: 11
Diffstat (limited to 'src/test/perl/PostgreSQL/Test/Cluster.pm')
-rw-r--r-- | src/test/perl/PostgreSQL/Test/Cluster.pm | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index 2c2cd14a7fe..5e161dbee60 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -2547,6 +2547,22 @@ sub log_check =pod +=item log_contains(pattern, offset) + +Find pattern in logfile of node after offset byte. + +=cut + +sub log_contains +{ + my ($self, $pattern, $offset) = @_; + + return PostgreSQL::Test::Utils::slurp_file($self->logfile, $offset) =~ + m/$pattern/; +} + +=pod + =item $node->run_log(...) Runs a shell command like PostgreSQL::Test::Utils::run_log, but with connection parameters set |