From 74deadf240a521ef774dbb540f411e2bccb5b421 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 4 Sep 2024 09:38:36 +0900 Subject: [PATCH] Check availability of module injection_points in TAP tests This fixes various defects with installcheck for TAP tests that expect the module to exist in an installation, but it is not installed by default with installcheck. The check is refactored as a new routine in Cluster.pm. --- src/interfaces/libpq/Makefile | 2 +- src/interfaces/libpq/meson.build | 1 - .../libpq/t/005_negotiate_encryption.pl | 7 ++++-- src/test/modules/test_misc/t/005_timeouts.pl | 5 +---- .../test_misc/t/006_signal_autovacuum.pl | 9 ++++++++ src/test/perl/PostgreSQL/Test/Cluster.pm | 22 +++++++++++++++++++ .../recovery/t/041_checkpoint_at_promote.pl | 5 +---- 7 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 27f8499d8a..c1bf33dbdc 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -15,7 +15,7 @@ subdir = src/interfaces/libpq top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -export with_ssl with_gssapi with_krb_srvnam enable_injection_points +export with_ssl with_gssapi with_krb_srvnam PGFILEDESC = "PostgreSQL Access Library" diff --git a/src/interfaces/libpq/meson.build b/src/interfaces/libpq/meson.build index 7623aeadab..ed2a4048d1 100644 --- a/src/interfaces/libpq/meson.build +++ b/src/interfaces/libpq/meson.build @@ -121,7 +121,6 @@ tests += { 't/005_negotiate_encryption.pl', ], 'env': { - 'enable_injection_points': get_option('injection_points') ? 'yes' : 'no', 'with_ssl': ssl_library, 'with_gssapi': gssapi.found() ? 'yes' : 'no', 'with_krb_srvnam': 'postgres', diff --git a/src/interfaces/libpq/t/005_negotiate_encryption.pl b/src/interfaces/libpq/t/005_negotiate_encryption.pl index 73f0056f10..06d67de2db 100644 --- a/src/interfaces/libpq/t/005_negotiate_encryption.pl +++ b/src/interfaces/libpq/t/005_negotiate_encryption.pl @@ -90,8 +90,6 @@ my $kerberos_enabled = $ENV{PG_TEST_EXTRA} && $ENV{PG_TEST_EXTRA} =~ /\bkerberos\b/; my $ssl_supported = $ENV{with_ssl} eq 'openssl'; -my $injection_points_supported = $ENV{enable_injection_points} eq 'yes'; - ### ### Prepare test server for GSSAPI and SSL authentication, with a few ### different test users and helper functions. We don't actually @@ -151,6 +149,11 @@ if ($ssl_supported != 0) $node->start; +# Check if the extension injection_points is available, as it may be +# possible that this script is run with installcheck, where the module +# would not be installed by default. +my $injection_points_supported = $node->check_extension('injection_points'); + $node->safe_psql('postgres', 'CREATE USER localuser;'); $node->safe_psql('postgres', 'CREATE USER testuser;'); $node->safe_psql('postgres', 'CREATE USER ssluser;'); diff --git a/src/test/modules/test_misc/t/005_timeouts.pl b/src/test/modules/test_misc/t/005_timeouts.pl index 53e44016e3..d9b7219121 100644 --- a/src/test/modules/test_misc/t/005_timeouts.pl +++ b/src/test/modules/test_misc/t/005_timeouts.pl @@ -28,10 +28,7 @@ $node->start; # Check if the extension injection_points is available, as it may be # possible that this script is run with installcheck, where the module # would not be installed by default. -my $result = $node->safe_psql('postgres', - "SELECT count(*) > 0 FROM pg_available_extensions WHERE name = 'injection_points';" -); -if ($result eq 'f') +if (!$node->check_extension('injection_points')) { plan skip_all => 'Extension injection_points not installed'; } diff --git a/src/test/modules/test_misc/t/006_signal_autovacuum.pl b/src/test/modules/test_misc/t/006_signal_autovacuum.pl index 929253f754..aaea569c10 100644 --- a/src/test/modules/test_misc/t/006_signal_autovacuum.pl +++ b/src/test/modules/test_misc/t/006_signal_autovacuum.pl @@ -25,6 +25,15 @@ $node->init; # This ensures a quick worker spawn. $node->append_conf('postgresql.conf', 'autovacuum_naptime = 1'); $node->start; + +# Check if the extension injection_points is available, as it may be +# possible that this script is run with installcheck, where the module +# would not be installed by default. +if (!$node->check_extension('injection_points')) +{ + plan skip_all => 'Extension injection_points not installed'; +} + $node->safe_psql('postgres', 'CREATE EXTENSION injection_points;'); $node->safe_psql( diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index fe6ebf10f7..143dc8c101 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -2837,6 +2837,28 @@ sub lsn =pod +=item $node->check_extension(extension_name) + +Scan pg_available_extensions to check that an extension is available in an +installation. + +Returns 1 if the extension is available, 0 otherwise. + +=cut + +sub check_extension +{ + my ($self, $extension_name) = @_; + + my $result = $self->safe_psql('postgres', + "SELECT count(*) > 0 FROM pg_available_extensions WHERE name = '$extension_name';" + ); + + return $result eq 't' ? 1 : 0; +} + +=pod + =item $node->wait_for_event(wait_event_name, backend_type) Poll pg_stat_activity until backend_type reaches wait_event_name. diff --git a/src/test/recovery/t/041_checkpoint_at_promote.pl b/src/test/recovery/t/041_checkpoint_at_promote.pl index 905662353d..3c21d18e3a 100644 --- a/src/test/recovery/t/041_checkpoint_at_promote.pl +++ b/src/test/recovery/t/041_checkpoint_at_promote.pl @@ -38,10 +38,7 @@ $node_primary->start; # Check if the extension injection_points is available, as it may be # possible that this script is run with installcheck, where the module # would not be installed by default. -my $result = $node_primary->safe_psql('postgres', - "SELECT count(*) > 0 FROM pg_available_extensions WHERE name = 'injection_points';" -); -if ($result eq 'f') +if (!$node_primary->check_extension('injection_points')) { plan skip_all => 'Extension injection_points not installed'; } -- 2.45.2