postgres.git / summary / log / commit / refs

commit    0ff95e0a5be1372bfba9db284ea17c8e0e5da3a0
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Apr 23 06:33:07 2025 +0000
First released in: 18.0

    psql: Rework TAP routine psql_fails_like() to define WAL sender context
    
    The routine was coded so as a WAL sender was always used, state required
    only for one failure test related to START_REPLICATION.  This test is
    changed so as a WAL sender is used by passing a replication option to
    psql_fails_like(), instead of forcing the use of a WAL sender for all
    the tests.
    
    This has come up as useful in the context of a separate bug fix where
    we are looking at extending tests for some failure scenarios.  These
    tests need to happen in the context of a normal backend, and not a WAL
    sender where the extended query protocol cannot be used.
    
    Discussion: https://postgr.es/m/aAXkJIOildLUA7vQ@paquier.xyz


 src/bin/psql/t/001_basic.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/psql/t/001_basic.pl b/src/bin/psql/t/001_basic.pl
index 739cb439708..b0e4919d4d7 100644
--- a/src/bin/psql/t/001_basic.pl
+++ b/src/bin/psql/t/001_basic.pl
@@ -34,11 +34,13 @@ sub psql_fails_like
 {
 	local $Test::Builder::Level = $Test::Builder::Level + 1;
 
-	my ($node, $sql, $expected_stderr, $test_name) = @_;
+	my ($node, $sql, $expected_stderr, $test_name, $replication) = @_;
+
+	# Use the context of a WAL sender, if requested by the caller.
+	$replication = '' unless defined($replication);
 
-	# Use the context of a WAL sender, some of the tests rely on that.
 	my ($ret, $stdout, $stderr) =
-	  $node->psql('postgres', $sql, replication => 'database');
+	  $node->psql('postgres', $sql, replication => $replication);
 
 	isnt($ret, 0, "$test_name: exit code not 0");
 	like($stderr, $expected_stderr, "$test_name: matches");
@@ -79,7 +81,7 @@ psql_fails_like(
 	$node,
 	'START_REPLICATION 0/0',
 	qr/unexpected PQresultStatus: 8$/,
-	'handling of unexpected PQresultStatus');
+	'handling of unexpected PQresultStatus', 'database');
 
 # test \timing
 psql_like(


[parent: 0e091ce409e0]