From 8598da24b4ddee025c22dc682443199e516611a1 Mon Sep 17 00:00:00 2001 From: Bharath Rupireddy Date: Mon, 1 Jan 2024 07:42:01 +0000 Subject: [PATCH v2] Remove unneeded PGDATABASE setting from TAP tests Some of the TAP tests are explicitly setting PGDATABASE environment variable to 'postgres', which isn't needed because the TAP test's perl library PostgreSQL::Test::Cluster already sets it once and for all. This commit removes all such unneeded PGDATABASE settings. --- src/bin/scripts/t/011_clusterdb_all.pl | 4 ---- src/test/recovery/t/004_timeline_switch.pl | 2 -- src/test/recovery/t/019_replslot_limit.pl | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/bin/scripts/t/011_clusterdb_all.pl b/src/bin/scripts/t/011_clusterdb_all.pl index 26315d0a51..90e0b0aa31 100644 --- a/src/bin/scripts/t/011_clusterdb_all.pl +++ b/src/bin/scripts/t/011_clusterdb_all.pl @@ -12,10 +12,6 @@ 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'; - $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 2500201b99..58d1f2ffc1 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 22ca8ecb5c..8a727c9bda 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']); -- 2.34.1