From 7dac61402e34c6d41d5d11cdc4c6a55f91e24026 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Thu, 24 Mar 2022 20:51:40 +0100 Subject: [PATCH] Remove unused module imports from TAP tests The Config and Cwd modules were no longer used, but remained imported, in a number of tests. Remove to keep the imports to the actually used modules. Reviewed-by: Andrew Dunstan Discussion: https://postgr.es/m/A5A074CD-3198-492B-BE5E-7961EFC3733F@yesql.se --- contrib/amcheck/t/002_cic.pl | 1 - contrib/amcheck/t/003_cic_2pc.pl | 1 - src/bin/pg_basebackup/t/010_pg_basebackup.pl | 2 -- src/bin/pg_checksums/t/002_actions.pl | 1 - src/bin/pg_dump/t/001_basic.pl | 1 - src/bin/pg_dump/t/002_pg_dump.pl | 1 - src/bin/pg_test_fsync/t/001_basic.pl | 1 - src/bin/pg_test_timing/t/001_basic.pl | 1 - src/bin/pg_verifybackup/t/002_algorithm.pl | 2 -- src/bin/pg_verifybackup/t/003_corruption.pl | 2 -- src/bin/pg_verifybackup/t/004_options.pl | 2 -- src/bin/pg_verifybackup/t/005_bad_manifest.pl | 2 -- src/bin/pg_verifybackup/t/006_encoding.pl | 2 -- src/bin/pg_verifybackup/t/007_wal.pl | 2 -- src/bin/pg_verifybackup/t/008_untar.pl | 1 - src/bin/pg_verifybackup/t/009_extract.pl | 2 -- src/bin/pg_verifybackup/t/010_client_untar.pl | 1 - src/bin/pgbench/t/001_pgbench_with_server.pl | 1 - src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl | 1 - src/test/modules/test_pg_dump/t/001_base.pl | 1 - src/test/perl/PostgreSQL/Test/Cluster.pm | 1 - src/test/recovery/t/011_crash_recovery.pl | 1 - src/test/recovery/t/013_crash_restart.pl | 1 - src/test/recovery/t/017_shm.pl | 1 - src/test/recovery/t/020_archive_status.pl | 1 - src/test/recovery/t/021_row_visibility.pl | 1 - 26 files changed, 34 deletions(-) diff --git a/contrib/amcheck/t/002_cic.pl b/contrib/amcheck/t/002_cic.pl index b8e4ac7cf4..32e4e4abd8 100644 --- a/contrib/amcheck/t/002_cic.pl +++ b/contrib/amcheck/t/002_cic.pl @@ -5,7 +5,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/contrib/amcheck/t/003_cic_2pc.pl b/contrib/amcheck/t/003_cic_2pc.pl index e66ccd93f1..1a2cceae49 100644 --- a/contrib/amcheck/t/003_cic_2pc.pl +++ b/contrib/amcheck/t/003_cic_2pc.pl @@ -5,7 +5,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 2869a239e7..9aa35a16a4 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -3,8 +3,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Basename qw(basename dirname); use File::Path qw(rmtree); use Fcntl qw(:seek); diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl index 751f732451..62c608eaf6 100644 --- a/src/bin/pg_checksums/t/002_actions.pl +++ b/src/bin/pg_checksums/t/002_actions.pl @@ -6,7 +6,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl index 48faeb4371..e0bf3eb032 100644 --- a/src/bin/pg_dump/t/001_basic.pl +++ b/src/bin/pg_dump/t/001_basic.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index 19f908f600..0e724b0366 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_test_fsync/t/001_basic.pl b/src/bin/pg_test_fsync/t/001_basic.pl index 0b579dde9d..8c5c0e7967 100644 --- a/src/bin/pg_test_fsync/t/001_basic.pl +++ b/src/bin/pg_test_fsync/t/001_basic.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_test_timing/t/001_basic.pl b/src/bin/pg_test_timing/t/001_basic.pl index ef9f6d6746..51bf68b0e1 100644 --- a/src/bin/pg_test_timing/t/001_basic.pl +++ b/src/bin/pg_test_timing/t/001_basic.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_verifybackup/t/002_algorithm.pl b/src/bin/pg_verifybackup/t/002_algorithm.pl index 20e3ca587a..ca2c0f0c7b 100644 --- a/src/bin/pg_verifybackup/t/002_algorithm.pl +++ b/src/bin/pg_verifybackup/t/002_algorithm.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl index 406c0c9877..843016ad80 100644 --- a/src/bin/pg_verifybackup/t/003_corruption.pl +++ b/src/bin/pg_verifybackup/t/003_corruption.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/004_options.pl b/src/bin/pg_verifybackup/t/004_options.pl index 7461dee03f..6fdd74e5ee 100644 --- a/src/bin/pg_verifybackup/t/004_options.pl +++ b/src/bin/pg_verifybackup/t/004_options.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/005_bad_manifest.pl b/src/bin/pg_verifybackup/t/005_bad_manifest.pl index 118beb53d7..74d0a8d1b2 100644 --- a/src/bin/pg_verifybackup/t/005_bad_manifest.pl +++ b/src/bin/pg_verifybackup/t/005_bad_manifest.pl @@ -6,8 +6,6 @@ use strict; use warnings; -use Cwd; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_verifybackup/t/006_encoding.pl b/src/bin/pg_verifybackup/t/006_encoding.pl index ce45c919a8..210f269d59 100644 --- a/src/bin/pg_verifybackup/t/006_encoding.pl +++ b/src/bin/pg_verifybackup/t/006_encoding.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/bin/pg_verifybackup/t/007_wal.pl b/src/bin/pg_verifybackup/t/007_wal.pl index 56fcd84bec..bef2701ef7 100644 --- a/src/bin/pg_verifybackup/t/007_wal.pl +++ b/src/bin/pg_verifybackup/t/007_wal.pl @@ -5,8 +5,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/008_untar.pl b/src/bin/pg_verifybackup/t/008_untar.pl index 98d09ce40c..915249a19d 100644 --- a/src/bin/pg_verifybackup/t/008_untar.pl +++ b/src/bin/pg_verifybackup/t/008_untar.pl @@ -7,7 +7,6 @@ use strict; use warnings; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/009_extract.pl b/src/bin/pg_verifybackup/t/009_extract.pl index 9f9cc7540b..41a5b370cc 100644 --- a/src/bin/pg_verifybackup/t/009_extract.pl +++ b/src/bin/pg_verifybackup/t/009_extract.pl @@ -6,8 +6,6 @@ use strict; use warnings; -use Cwd; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pg_verifybackup/t/010_client_untar.pl b/src/bin/pg_verifybackup/t/010_client_untar.pl index 487e30e826..488a6d1ede 100644 --- a/src/bin/pg_verifybackup/t/010_client_untar.pl +++ b/src/bin/pg_verifybackup/t/010_client_untar.pl @@ -6,7 +6,6 @@ use strict; use warnings; -use Config; use File::Path qw(rmtree); use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl index 3eb5905e5a..60cae1e843 100644 --- a/src/bin/pgbench/t/001_pgbench_with_server.pl +++ b/src/bin/pgbench/t/001_pgbench_with_server.pl @@ -7,7 +7,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; # start a pgbench specific server my $node = PostgreSQL::Test::Cluster->new('main'); diff --git a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl index 0c164dcaba..cc79d96d47 100644 --- a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl +++ b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/test/modules/test_pg_dump/t/001_base.pl b/src/test/modules/test_pg_dump/t/001_base.pl index c73bd37835..84a35590b7 100644 --- a/src/test/modules/test_pg_dump/t/001_base.pl +++ b/src/test/modules/test_pg_dump/t/001_base.pl @@ -4,7 +4,6 @@ use strict; use warnings; -use Config; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index e7b9161137..0295731bd0 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -93,7 +93,6 @@ use warnings; use Carp; use Config; -use Cwd; use Fcntl qw(:mode); use File::Basename; use File::Path qw(rmtree); diff --git a/src/test/recovery/t/011_crash_recovery.pl b/src/test/recovery/t/011_crash_recovery.pl index 14154d1ce0..1b57d01046 100644 --- a/src/test/recovery/t/011_crash_recovery.pl +++ b/src/test/recovery/t/011_crash_recovery.pl @@ -9,7 +9,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; my $node = PostgreSQL::Test::Cluster->new('primary'); $node->init(allows_streaming => 1); diff --git a/src/test/recovery/t/013_crash_restart.pl b/src/test/recovery/t/013_crash_restart.pl index 44c4c62cb7..8807c0a291 100644 --- a/src/test/recovery/t/013_crash_restart.pl +++ b/src/test/recovery/t/013_crash_restart.pl @@ -16,7 +16,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; my $psql_timeout = IPC::Run::timer($PostgreSQL::Test::Utils::timeout_default); diff --git a/src/test/recovery/t/017_shm.pl b/src/test/recovery/t/017_shm.pl index 713e6f068d..875657b4bb 100644 --- a/src/test/recovery/t/017_shm.pl +++ b/src/test/recovery/t/017_shm.pl @@ -6,7 +6,6 @@ # use strict; use warnings; -use Config; use File::stat qw(stat); use IPC::Run 'run'; use PostgreSQL::Test::Cluster; diff --git a/src/test/recovery/t/020_archive_status.pl b/src/test/recovery/t/020_archive_status.pl index cbff26e122..e6e4eb56a9 100644 --- a/src/test/recovery/t/020_archive_status.pl +++ b/src/test/recovery/t/020_archive_status.pl @@ -9,7 +9,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; my $primary = PostgreSQL::Test::Cluster->new('primary'); $primary->init( diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl index 55d8c31b56..aeaf37cfad 100644 --- a/src/test/recovery/t/021_row_visibility.pl +++ b/src/test/recovery/t/021_row_visibility.pl @@ -9,7 +9,6 @@ use warnings; use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Utils; use Test::More; -use Config; # Initialize primary node my $node_primary = PostgreSQL::Test::Cluster->new('primary');