From: Andrew Dunstan <andrew@dunslane.net>
Date: Fri, 12 Jul 2024 22:29:15 +0000 (-0400)
Subject: Make sure to run pg_isready on correct port
X-Git-Tag: REL_12_20~24
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=53a14ec29024e8060755e462c384bc6c323dee14;p=postgresql.git

Make sure to run pg_isready on correct port

The current code can have pg_isready unexpectedly succeed if there is a
server running on the default port. To avoid this we delay running the
test until after a node has been created but before it starts, and then
use that node's port, so we are fairly sure there is nothing running on
the port.

Backpatch to all live branches.
---

diff --git a/src/bin/scripts/t/080_pg_isready.pl b/src/bin/scripts/t/080_pg_isready.pl
index fc2f54f061c..558635caf2f 100644
--- a/src/bin/scripts/t/080_pg_isready.pl
+++ b/src/bin/scripts/t/080_pg_isready.pl
@@ -9,10 +9,11 @@ program_help_ok('pg_isready');
 program_version_ok('pg_isready');
 program_options_handling_ok('pg_isready');
 
-command_fails(['pg_isready'], 'fails with no server running');
-
 my $node = get_new_node('main');
 $node->init;
+
+$node->command_fails(['pg_isready'], 'fails with no server running');
+
 $node->start;
 
 $node->command_ok(