summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier2024-01-03 01:28:05 +0000
committerMichael Paquier2024-01-03 01:28:05 +0000
commit4b66d7b4e0b3bb55c04fe9466b428c24d7cb0980 (patch)
tree300a559560fc824be472504ad97fd4ab6339a3e9 /src
parentae6bc39317f59dff5eb549e77d3f7e330e9ba075 (diff)
Remove unnecessary PGDATABASE settings from TAP tests
Some of the TAP tests have been historically setting the environment variable PGDATABASE to 'postgres', which is not needed because PostgreSQL::Test::Cluster already sets it when initialized. This commit removes these explicit setups. Note that the dependency of cluster -a with PGDATABASE (from 1caef31d9e55) is still documented. Author: Bharath Rupireddy Discussion: https://postgr.es/m/CALj2ACXLAz5dW3ZP+Fec8g6jQMMmDyCVT+qdbye2h7QJJmhsdw@mail.gmail.com
Diffstat (limited to 'src')
-rw-r--r--src/bin/scripts/t/011_clusterdb_all.pl6
-rw-r--r--src/test/recovery/t/004_timeline_switch.pl2
-rw-r--r--src/test/recovery/t/019_replslot_limit.pl2
3 files changed, 2 insertions, 8 deletions
diff --git a/src/bin/scripts/t/011_clusterdb_all.pl b/src/bin/scripts/t/011_clusterdb_all.pl
index 26315d0a510..f1cb5e3f155 100644
--- a/src/bin/scripts/t/011_clusterdb_all.pl
+++ b/src/bin/scripts/t/011_clusterdb_all.pl
@@ -12,10 +12,8 @@ my $node = PostgreSQL::Test::Cluster->new('main');
$node->init;
$node->start;
-# clusterdb -a is not compatible with -d, hence enforce environment variable
-# correctly.
-$ENV{PGDATABASE} = 'postgres';
-
+# clusterdb -a is not compatible with -d. This relies on PGDATABASE to be
+# set, something PostgreSQL::Test::Cluster does.
$node->issues_sql_like(
[ 'clusterdb', '-a' ],
qr/statement: CLUSTER.*statement: CLUSTER/s,
diff --git a/src/test/recovery/t/004_timeline_switch.pl b/src/test/recovery/t/004_timeline_switch.pl
index 2500201b995..58d1f2ffc1b 100644
--- a/src/test/recovery/t/004_timeline_switch.pl
+++ b/src/test/recovery/t/004_timeline_switch.pl
@@ -8,8 +8,6 @@ use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils;
use Test::More;
-$ENV{PGDATABASE} = 'postgres';
-
# Ensure that a cascading standby is able to follow a newly-promoted standby
# on a new timeline.
diff --git a/src/test/recovery/t/019_replslot_limit.pl b/src/test/recovery/t/019_replslot_limit.pl
index 22ca8ecb5cc..8a727c9bda2 100644
--- a/src/test/recovery/t/019_replslot_limit.pl
+++ b/src/test/recovery/t/019_replslot_limit.pl
@@ -12,8 +12,6 @@ use PostgreSQL::Test::Cluster;
use Test::More;
use Time::HiRes qw(usleep);
-$ENV{PGDATABASE} = 'postgres';
-
# Initialize primary node, setting wal-segsize to 1MB
my $node_primary = PostgreSQL::Test::Cluster->new('primary');
$node_primary->init(allows_streaming => 1, extra => ['--wal-segsize=1']);