Hi,
While trying to add some new tests, I found that
PostgreSQL::Test::Utils is not required. I felt
PostgreSQL::Test::Utils can be removed from a lot of tap tests which
do not require it. I removed it, ran the tests and found the tests to
be executing fine. I have made a patch including the changes for it.
If this import can be removed, kindly accept the attached patch for
the same.
Regards,
Vignesh
From 2767effd2ef88fa82d830d877d1fe3b349b0683a Mon Sep 17 00:00:00 2001
From: Vigneshwaran C <vignes...@gmail.com>
Date: Wed, 3 Nov 2021 15:12:45 +0530
Subject: [PATCH v1] Removed unused import modules from tap tests.
PostgreSQL::Test::Utils were not being used by a lot of tap tests, removed
it from the tap tests which does not require it.
---
contrib/amcheck/t/001_verify_heapam.pl | 1 -
contrib/amcheck/t/002_cic.pl | 1 -
contrib/amcheck/t/003_cic_2pc.pl | 1 -
contrib/bloom/t/001_wal.pl | 1 -
contrib/test_decoding/t/001_repl_stats.pl | 1 -
src/bin/pg_amcheck/t/002_nonesuch.pl | 1 -
src/bin/pg_amcheck/t/004_verify_heapam.pl | 1 -
src/bin/pg_amcheck/t/005_opclass_damage.pl | 1 -
src/bin/psql/t/010_tab_completion.pl | 1 -
src/test/modules/brin/t/01_workitems.pl | 1 -
src/test/modules/commit_ts/t/001_base.pl | 1 -
src/test/modules/commit_ts/t/002_standby.pl | 1 -
src/test/modules/commit_ts/t/004_restart.pl | 1 -
src/test/modules/test_misc/t/001_constraint_validation.pl | 1 -
src/test/recovery/t/001_stream_rep.pl | 1 -
src/test/recovery/t/004_timeline_switch.pl | 1 -
src/test/recovery/t/005_replay_delay.pl | 1 -
src/test/recovery/t/006_logical_decoding.pl | 1 -
src/test/recovery/t/007_sync_rep.pl | 1 -
src/test/recovery/t/008_fsm_truncation.pl | 1 -
src/test/recovery/t/009_twophase.pl | 1 -
src/test/recovery/t/010_logical_decoding_timelines.pl | 1 -
src/test/recovery/t/011_crash_recovery.pl | 1 -
src/test/recovery/t/012_subtransactions.pl | 1 -
src/test/recovery/t/013_crash_restart.pl | 1 -
src/test/recovery/t/015_promotion_pages.pl | 1 -
src/test/recovery/t/019_replslot_limit.pl | 1 -
src/test/recovery/t/020_archive_status.pl | 1 -
src/test/recovery/t/021_row_visibility.pl | 1 -
src/test/recovery/t/022_crash_temp_files.pl | 1 -
src/test/recovery/t/023_pitr_prepared_xact.pl | 1 -
src/test/recovery/t/025_stuck_on_old_timeline.pl | 1 -
src/test/subscription/t/002_types.pl | 1 -
src/test/subscription/t/003_constraints.pl | 1 -
src/test/subscription/t/004_sync.pl | 1 -
src/test/subscription/t/005_encoding.pl | 1 -
src/test/subscription/t/006_rewrite.pl | 1 -
src/test/subscription/t/007_ddl.pl | 1 -
src/test/subscription/t/008_diff_schema.pl | 1 -
src/test/subscription/t/009_matviews.pl | 1 -
src/test/subscription/t/010_truncate.pl | 1 -
src/test/subscription/t/011_generated.pl | 1 -
src/test/subscription/t/012_collation.pl | 1 -
src/test/subscription/t/014_binary.pl | 1 -
src/test/subscription/t/015_stream.pl | 1 -
src/test/subscription/t/016_stream_subxact.pl | 1 -
src/test/subscription/t/017_stream_ddl.pl | 1 -
src/test/subscription/t/018_stream_subxact_abort.pl | 1 -
src/test/subscription/t/019_stream_subxact_ddl_abort.pl | 1 -
src/test/subscription/t/020_messages.pl | 1 -
src/test/subscription/t/021_twophase.pl | 1 -
src/test/subscription/t/022_twophase_cascade.pl | 1 -
src/test/subscription/t/023_twophase_stream.pl | 1 -
src/test/subscription/t/024_add_drop_pub.pl | 1 -
src/test/subscription/t/025_rep_changes_for_schema.pl | 1 -
src/test/subscription/t/100_bugs.pl | 1 -
56 files changed, 56 deletions(-)
diff --git a/contrib/amcheck/t/001_verify_heapam.pl b/contrib/amcheck/t/001_verify_heapam.pl
index 606235fcc1..2be0c9dcf5 100644
--- a/contrib/amcheck/t/001_verify_heapam.pl
+++ b/contrib/amcheck/t/001_verify_heapam.pl
@@ -5,7 +5,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Fcntl qw(:seek);
use Test::More tests => 272;
diff --git a/contrib/amcheck/t/002_cic.pl b/contrib/amcheck/t/002_cic.pl
index ac38dd91dc..11c836d0ad 100644
--- a/contrib/amcheck/t/002_cic.pl
+++ b/contrib/amcheck/t/002_cic.pl
@@ -7,7 +7,6 @@ use warnings;
use Config;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 3;
diff --git a/contrib/amcheck/t/003_cic_2pc.pl b/contrib/amcheck/t/003_cic_2pc.pl
index f4924745a3..fe85a4c61c 100644
--- a/contrib/amcheck/t/003_cic_2pc.pl
+++ b/contrib/amcheck/t/003_cic_2pc.pl
@@ -7,7 +7,6 @@ use warnings;
use Config;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 5;
diff --git a/contrib/bloom/t/001_wal.pl b/contrib/bloom/t/001_wal.pl
index f1184028bc..6f9404bcdd 100644
--- a/contrib/bloom/t/001_wal.pl
+++ b/contrib/bloom/t/001_wal.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 31;
my $node_primary;
diff --git a/contrib/test_decoding/t/001_repl_stats.pl b/contrib/test_decoding/t/001_repl_stats.pl
index 7f91fa3ad4..a5031c5010 100644
--- a/contrib/test_decoding/t/001_repl_stats.pl
+++ b/contrib/test_decoding/t/001_repl_stats.pl
@@ -7,7 +7,6 @@ use strict;
use warnings;
use File::Path qw(rmtree);
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
# Test set-up
diff --git a/src/bin/pg_amcheck/t/002_nonesuch.pl b/src/bin/pg_amcheck/t/002_nonesuch.pl
index 513a18d671..f403b07d18 100644
--- a/src/bin/pg_amcheck/t/002_nonesuch.pl
+++ b/src/bin/pg_amcheck/t/002_nonesuch.pl
@@ -5,7 +5,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 76;
# Test set-up
diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl
index 4ca7ed297c..3fd8b5fccd 100644
--- a/src/bin/pg_amcheck/t/004_verify_heapam.pl
+++ b/src/bin/pg_amcheck/t/004_verify_heapam.pl
@@ -5,7 +5,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Fcntl qw(:seek);
use Test::More;
diff --git a/src/bin/pg_amcheck/t/005_opclass_damage.pl b/src/bin/pg_amcheck/t/005_opclass_damage.pl
index 2f86f4f2a4..067119a156 100644
--- a/src/bin/pg_amcheck/t/005_opclass_damage.pl
+++ b/src/bin/pg_amcheck/t/005_opclass_damage.pl
@@ -7,7 +7,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 5;
my $node = PostgreSQL::Test::Cluster->new('test');
diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl
index 55b318517e..5bc7a0079f 100644
--- a/src/bin/psql/t/010_tab_completion.pl
+++ b/src/bin/psql/t/010_tab_completion.pl
@@ -5,7 +5,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More;
use IPC::Run qw(pump finish timer);
use Data::Dumper;
diff --git a/src/test/modules/brin/t/01_workitems.pl b/src/test/modules/brin/t/01_workitems.pl
index 48bb8abfe6..235f4175aa 100644
--- a/src/test/modules/brin/t/01_workitems.pl
+++ b/src/test/modules/brin/t/01_workitems.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
use PostgreSQL::Test::Cluster;
diff --git a/src/test/modules/commit_ts/t/001_base.pl b/src/test/modules/commit_ts/t/001_base.pl
index 16f0f12253..8199eca9ac 100644
--- a/src/test/modules/commit_ts/t/001_base.pl
+++ b/src/test/modules/commit_ts/t/001_base.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
use PostgreSQL::Test::Cluster;
diff --git a/src/test/modules/commit_ts/t/002_standby.pl b/src/test/modules/commit_ts/t/002_standby.pl
index c22956c9ea..afd5345bae 100644
--- a/src/test/modules/commit_ts/t/002_standby.pl
+++ b/src/test/modules/commit_ts/t/002_standby.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
-use PostgreSQL::Test::Utils;
use Test::More tests => 4;
use PostgreSQL::Test::Cluster;
diff --git a/src/test/modules/commit_ts/t/004_restart.pl b/src/test/modules/commit_ts/t/004_restart.pl
index c0f3a7c8af..ab9769a1b9 100644
--- a/src/test/modules/commit_ts/t/004_restart.pl
+++ b/src/test/modules/commit_ts/t/004_restart.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 16;
my $node_primary = PostgreSQL::Test::Cluster->new('primary');
diff --git a/src/test/modules/test_misc/t/001_constraint_validation.pl b/src/test/modules/test_misc/t/001_constraint_validation.pl
index 147daf0832..72c3d1e813 100644
--- a/src/test/modules/test_misc/t/001_constraint_validation.pl
+++ b/src/test/modules/test_misc/t/001_constraint_validation.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 42;
# Initialize a test cluster
diff --git a/src/test/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl
index c70c08e27b..a70fc2cc38 100644
--- a/src/test/recovery/t/001_stream_rep.pl
+++ b/src/test/recovery/t/001_stream_rep.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 53;
# Initialize primary node
diff --git a/src/test/recovery/t/004_timeline_switch.pl b/src/test/recovery/t/004_timeline_switch.pl
index 56dd1c4f1a..74af840920 100644
--- a/src/test/recovery/t/004_timeline_switch.pl
+++ b/src/test/recovery/t/004_timeline_switch.pl
@@ -6,7 +6,6 @@ use strict;
use warnings;
use File::Path qw(rmtree);
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 3;
$ENV{PGDATABASE} = 'postgres';
diff --git a/src/test/recovery/t/005_replay_delay.pl b/src/test/recovery/t/005_replay_delay.pl
index db44c287d2..92cb35f577 100644
--- a/src/test/recovery/t/005_replay_delay.pl
+++ b/src/test/recovery/t/005_replay_delay.pl
@@ -6,7 +6,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 3;
# Initialize primary node
diff --git a/src/test/recovery/t/006_logical_decoding.pl b/src/test/recovery/t/006_logical_decoding.pl
index 46ea5a3866..55e69901a6 100644
--- a/src/test/recovery/t/006_logical_decoding.pl
+++ b/src/test/recovery/t/006_logical_decoding.pl
@@ -9,7 +9,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 15;
use Config;
diff --git a/src/test/recovery/t/007_sync_rep.pl b/src/test/recovery/t/007_sync_rep.pl
index 0d0e60b772..af4f6dd494 100644
--- a/src/test/recovery/t/007_sync_rep.pl
+++ b/src/test/recovery/t/007_sync_rep.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 11;
# Query checking sync_priority and sync_state of each standby
diff --git a/src/test/recovery/t/008_fsm_truncation.pl b/src/test/recovery/t/008_fsm_truncation.pl
index e8c59678fd..fe1aadfc45 100644
--- a/src/test/recovery/t/008_fsm_truncation.pl
+++ b/src/test/recovery/t/008_fsm_truncation.pl
@@ -9,7 +9,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 1;
my $node_primary = PostgreSQL::Test::Cluster->new('primary');
diff --git a/src/test/recovery/t/009_twophase.pl b/src/test/recovery/t/009_twophase.pl
index b11832b99a..c92c36d4c7 100644
--- a/src/test/recovery/t/009_twophase.pl
+++ b/src/test/recovery/t/009_twophase.pl
@@ -6,7 +6,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 24;
my $psql_out = '';
diff --git a/src/test/recovery/t/010_logical_decoding_timelines.pl b/src/test/recovery/t/010_logical_decoding_timelines.pl
index 68d94ac91c..c327c93654 100644
--- a/src/test/recovery/t/010_logical_decoding_timelines.pl
+++ b/src/test/recovery/t/010_logical_decoding_timelines.pl
@@ -25,7 +25,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 13;
use File::Copy;
use IPC::Run ();
diff --git a/src/test/recovery/t/011_crash_recovery.pl b/src/test/recovery/t/011_crash_recovery.pl
index d7806e6671..d39cc44ba2 100644
--- a/src/test/recovery/t/011_crash_recovery.pl
+++ b/src/test/recovery/t/011_crash_recovery.pl
@@ -7,7 +7,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More;
use Config;
diff --git a/src/test/recovery/t/012_subtransactions.pl b/src/test/recovery/t/012_subtransactions.pl
index dbdc2d38bd..a0ec37b3f1 100644
--- a/src/test/recovery/t/012_subtransactions.pl
+++ b/src/test/recovery/t/012_subtransactions.pl
@@ -6,7 +6,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 12;
# Setup primary node
diff --git a/src/test/recovery/t/013_crash_restart.pl b/src/test/recovery/t/013_crash_restart.pl
index 49aee1e243..a914c65af3 100644
--- a/src/test/recovery/t/013_crash_restart.pl
+++ b/src/test/recovery/t/013_crash_restart.pl
@@ -14,7 +14,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More;
use Config;
diff --git a/src/test/recovery/t/015_promotion_pages.pl b/src/test/recovery/t/015_promotion_pages.pl
index b0f5ae615a..d6c62cc80c 100644
--- a/src/test/recovery/t/015_promotion_pages.pl
+++ b/src/test/recovery/t/015_promotion_pages.pl
@@ -8,7 +8,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 1;
# Initialize primary node
diff --git a/src/test/recovery/t/019_replslot_limit.pl b/src/test/recovery/t/019_replslot_limit.pl
index 2275e28a50..be772b6700 100644
--- a/src/test/recovery/t/019_replslot_limit.pl
+++ b/src/test/recovery/t/019_replslot_limit.pl
@@ -7,7 +7,6 @@
use strict;
use warnings;
-use PostgreSQL::Test::Utils;
use PostgreSQL::Test::Cluster;
use File::Path qw(rmtree);
diff --git a/src/test/recovery/t/020_archive_status.pl b/src/test/recovery/t/020_archive_status.pl
index 68a21eb82c..db190ed06a 100644
--- a/src/test/recovery/t/020_archive_status.pl
+++ b/src/test/recovery/t/020_archive_status.pl
@@ -7,7 +7,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 16;
use Config;
diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl
index 2d409434ef..346209af81 100644
--- a/src/test/recovery/t/021_row_visibility.pl
+++ b/src/test/recovery/t/021_row_visibility.pl
@@ -7,7 +7,6 @@ use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 10;
use Config;
diff --git a/src/test/recovery/t/022_crash_temp_files.pl b/src/test/recovery/t/022_crash_temp_files.pl
index bf95a30761..e112080ff0 100644
--- a/src/test/recovery/t/022_crash_temp_files.pl
+++ b/src/test/recovery/t/022_crash_temp_files.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More;
use Config;
diff --git a/src/test/recovery/t/023_pitr_prepared_xact.pl b/src/test/recovery/t/023_pitr_prepared_xact.pl
index 4fcc7ad400..0359245d97 100644
--- a/src/test/recovery/t/023_pitr_prepared_xact.pl
+++ b/src/test/recovery/t/023_pitr_prepared_xact.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 1;
use File::Compare;
diff --git a/src/test/recovery/t/025_stuck_on_old_timeline.pl b/src/test/recovery/t/025_stuck_on_old_timeline.pl
index 4e0f6291f4..29d2414194 100644
--- a/src/test/recovery/t/025_stuck_on_old_timeline.pl
+++ b/src/test/recovery/t/025_stuck_on_old_timeline.pl
@@ -9,7 +9,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use File::Basename;
use FindBin;
diff --git a/src/test/subscription/t/002_types.pl b/src/test/subscription/t/002_types.pl
index 1606d478d9..46d265c6fd 100644
--- a/src/test/subscription/t/002_types.pl
+++ b/src/test/subscription/t/002_types.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 4;
# Initialize publisher node
diff --git a/src/test/subscription/t/003_constraints.pl b/src/test/subscription/t/003_constraints.pl
index 752daabd96..9bda82f975 100644
--- a/src/test/subscription/t/003_constraints.pl
+++ b/src/test/subscription/t/003_constraints.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 6;
# Initialize publisher node
diff --git a/src/test/subscription/t/004_sync.pl b/src/test/subscription/t/004_sync.pl
index aae9bb4141..a0ef190b44 100644
--- a/src/test/subscription/t/004_sync.pl
+++ b/src/test/subscription/t/004_sync.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 8;
# Initialize publisher node
diff --git a/src/test/subscription/t/005_encoding.pl b/src/test/subscription/t/005_encoding.pl
index ea991f5a88..5f2f2c3e02 100644
--- a/src/test/subscription/t/005_encoding.pl
+++ b/src/test/subscription/t/005_encoding.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 1;
my $node_publisher = PostgreSQL::Test::Cluster->new('publisher');
diff --git a/src/test/subscription/t/006_rewrite.pl b/src/test/subscription/t/006_rewrite.pl
index 0e189469f7..e0ea057794 100644
--- a/src/test/subscription/t/006_rewrite.pl
+++ b/src/test/subscription/t/006_rewrite.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
my $node_publisher = PostgreSQL::Test::Cluster->new('publisher');
diff --git a/src/test/subscription/t/007_ddl.pl b/src/test/subscription/t/007_ddl.pl
index 8c869c5c15..0324db7e70 100644
--- a/src/test/subscription/t/007_ddl.pl
+++ b/src/test/subscription/t/007_ddl.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 1;
my $node_publisher = PostgreSQL::Test::Cluster->new('publisher');
diff --git a/src/test/subscription/t/008_diff_schema.pl b/src/test/subscription/t/008_diff_schema.pl
index 50a83b5218..ec8cbd18ec 100644
--- a/src/test/subscription/t/008_diff_schema.pl
+++ b/src/test/subscription/t/008_diff_schema.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 5;
# Create publisher node
diff --git a/src/test/subscription/t/009_matviews.pl b/src/test/subscription/t/009_matviews.pl
index f93ce1ef35..15749ddbe4 100644
--- a/src/test/subscription/t/009_matviews.pl
+++ b/src/test/subscription/t/009_matviews.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 1;
my $node_publisher = PostgreSQL::Test::Cluster->new('publisher');
diff --git a/src/test/subscription/t/010_truncate.pl b/src/test/subscription/t/010_truncate.pl
index 448032edf1..b499b11421 100644
--- a/src/test/subscription/t/010_truncate.pl
+++ b/src/test/subscription/t/010_truncate.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 14;
# setup
diff --git a/src/test/subscription/t/011_generated.pl b/src/test/subscription/t/011_generated.pl
index 781c87fddc..64f9a0f71d 100644
--- a/src/test/subscription/t/011_generated.pl
+++ b/src/test/subscription/t/011_generated.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
# setup
diff --git a/src/test/subscription/t/012_collation.pl b/src/test/subscription/t/012_collation.pl
index 06f19160e3..f54415182d 100644
--- a/src/test/subscription/t/012_collation.pl
+++ b/src/test/subscription/t/012_collation.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More;
if ($ENV{with_icu} eq 'yes')
diff --git a/src/test/subscription/t/014_binary.pl b/src/test/subscription/t/014_binary.pl
index 3dd69fb502..55d3972a6f 100644
--- a/src/test/subscription/t/014_binary.pl
+++ b/src/test/subscription/t/014_binary.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 5;
# Create and initialize a publisher node
diff --git a/src/test/subscription/t/015_stream.pl b/src/test/subscription/t/015_stream.pl
index debb74cc65..5b6a251892 100644
--- a/src/test/subscription/t/015_stream.pl
+++ b/src/test/subscription/t/015_stream.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 4;
# Create publisher node
diff --git a/src/test/subscription/t/016_stream_subxact.pl b/src/test/subscription/t/016_stream_subxact.pl
index 92c756dc2e..1d358f4564 100644
--- a/src/test/subscription/t/016_stream_subxact.pl
+++ b/src/test/subscription/t/016_stream_subxact.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
# Create publisher node
diff --git a/src/test/subscription/t/017_stream_ddl.pl b/src/test/subscription/t/017_stream_ddl.pl
index 8d8310ecbe..0b98e77ddb 100644
--- a/src/test/subscription/t/017_stream_ddl.pl
+++ b/src/test/subscription/t/017_stream_ddl.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 3;
# Create publisher node
diff --git a/src/test/subscription/t/018_stream_subxact_abort.pl b/src/test/subscription/t/018_stream_subxact_abort.pl
index df21377a6e..39bbcbf80a 100644
--- a/src/test/subscription/t/018_stream_subxact_abort.pl
+++ b/src/test/subscription/t/018_stream_subxact_abort.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 4;
# Create publisher node
diff --git a/src/test/subscription/t/019_stream_subxact_ddl_abort.pl b/src/test/subscription/t/019_stream_subxact_ddl_abort.pl
index 5e062f191c..47687fe3a9 100644
--- a/src/test/subscription/t/019_stream_subxact_ddl_abort.pl
+++ b/src/test/subscription/t/019_stream_subxact_ddl_abort.pl
@@ -6,7 +6,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 2;
# Create publisher node
diff --git a/src/test/subscription/t/020_messages.pl b/src/test/subscription/t/020_messages.pl
index 408a3ad1d6..1b092fc17f 100644
--- a/src/test/subscription/t/020_messages.pl
+++ b/src/test/subscription/t/020_messages.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 5;
# Create publisher node
diff --git a/src/test/subscription/t/021_twophase.pl b/src/test/subscription/t/021_twophase.pl
index f8597cfdaa..5d19159794 100644
--- a/src/test/subscription/t/021_twophase.pl
+++ b/src/test/subscription/t/021_twophase.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 24;
###############################
diff --git a/src/test/subscription/t/022_twophase_cascade.pl b/src/test/subscription/t/022_twophase_cascade.pl
index 8b402d63c0..fc862d1957 100644
--- a/src/test/subscription/t/022_twophase_cascade.pl
+++ b/src/test/subscription/t/022_twophase_cascade.pl
@@ -8,7 +8,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 41;
###############################
diff --git a/src/test/subscription/t/023_twophase_stream.pl b/src/test/subscription/t/023_twophase_stream.pl
index bc5a17581c..1945678fc6 100644
--- a/src/test/subscription/t/023_twophase_stream.pl
+++ b/src/test/subscription/t/023_twophase_stream.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 18;
###############################
diff --git a/src/test/subscription/t/024_add_drop_pub.pl b/src/test/subscription/t/024_add_drop_pub.pl
index 9384b3a9c4..e06d843300 100644
--- a/src/test/subscription/t/024_add_drop_pub.pl
+++ b/src/test/subscription/t/024_add_drop_pub.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 3;
# Initialize publisher node
diff --git a/src/test/subscription/t/025_rep_changes_for_schema.pl b/src/test/subscription/t/025_rep_changes_for_schema.pl
index 8f14da06a7..86d4699f33 100644
--- a/src/test/subscription/t/025_rep_changes_for_schema.pl
+++ b/src/test/subscription/t/025_rep_changes_for_schema.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 13;
# Initialize publisher node
diff --git a/src/test/subscription/t/100_bugs.pl b/src/test/subscription/t/100_bugs.pl
index 34a60fd9ab..ce98920b8f 100644
--- a/src/test/subscription/t/100_bugs.pl
+++ b/src/test/subscription/t/100_bugs.pl
@@ -5,7 +5,6 @@
use strict;
use warnings;
use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
use Test::More tests => 5;
# Bug #15114
--
2.30.2
