pgsql: Cleanup some code related to pgbench log checks in TAP tests

From: Michael Paquier <michael(at)paquier(dot)xyz>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Cleanup some code related to pgbench log checks in TAP tests
Date: 2021-06-25 11:16:47
Message-ID: E1lwjpH-0002Gs-Qj@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Cleanup some code related to pgbench log checks in TAP tests

This fixes a couple of problems within the so-said code of this commit
subject:
- Replace the use of open() with slurp_file(), fixing an issue reported
by buildfarm member fairywren whose perl installation keep around CRLF
characters, causing the matching patterns for the logs to fail.
- Remove the eval block, which is not really necessary.

This set of issues has come into light after fixing a different issue
with c13585fe, and this is wrong since this code has been introduced.

Reported-by: Andrew Dunstan, and buildfarm member fairywren
Author: Michael Paquier
Reviewed-by: Andrew Dunstan
Discussion: https://postgr.es/m/0f49303e-7784-b3ee-200b-cbf67be2eb9e@dunslane.net
Backpatch-through: 11

Branch
------
REL_12_STABLE

Details
-------
https://git.postgresql.org/pg/commitdiff/79c24a0c21c4e6d4e62ff0a2314b6dd759c1dd37

Modified Files
--------------
src/bin/pgbench/t/001_pgbench_with_server.pl | 31 ++++++++++++++++++----------
1 file changed, 20 insertions(+), 11 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Michael Paquier 2021-06-25 12:24:23 Re: pgsql: Fix pattern matching logic for logs in TAP tests of pgbench
Previous Message Andrew Dunstan 2021-06-25 10:12:09 Re: pgsql: Fix pattern matching logic for logs in TAP tests of pgbench