Merge ~paelzer/ubuntu/+source/postgresql-common:fix-12.4-tests-focal-1892335 into ubuntu/+source/postgresql-common:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4220/+packages

[Christian Ehrhardt  (paelzer)]

released through -security

diff --git a/debian/changelog b/debian/changelog
index abaa911..fc20877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgresql-common (214ubuntu0.1) focal; urgency=medium
+
+  [ Christoph Berg ]
+  * t/170_extensions.t: Don't drop plpgsql before testing extensions.
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 24 Aug 2020 10:41:25 +0200
+
 postgresql-common (214) unstable; urgency=medium
 
   * check_pidfile_running: Read /proc/$pid/cmdline instead of calling /bin/ps.
diff --git a/t/170_extensions.t b/t/170_extensions.t
index d8d4dcc..8584416 100644
--- a/t/170_extensions.t
+++ b/t/170_extensions.t
@@ -18,9 +18,8 @@ if ($v < '9.1') {
 # create cluster
 is ((system "pg_createcluster $v main --start >/dev/null"), 0, "pg_createcluster $v main");
 
-# plpgsql is installed by default; remove it to simplify test logic
-is_program_out 'postgres', "psql -qc 'DROP EXTENSION plpgsql'", 0, '';
-is_program_out 'postgres', "psql -Atc 'SELECT * FROM pg_extension'", 0, '';
+# plpgsql is installed by default
+is_program_out 'postgres', "psql -Atc 'SELECT extname FROM pg_extension'", 0, "plpgsql\n";
 
 my %depends = (
     earthdistance     => [qw(cube)],
@@ -37,23 +36,17 @@ my %depends = (
     ltree_plpython2u  => [qw(ltree plpython2u)],
     ltree_plpython3u  => [qw(ltree plpython3u)],
     ltree_plpythonu   => [qw(ltree plpythonu)],
-    # external extensions that might happen to be installed
-    db2fce            => [qw(plpgsql)],
-    pldbgapi          => [qw(plpgsql)],
-    unit              => [qw(plpgsql)],
 );
 
 foreach (</usr/share/postgresql/$v/extension/*.control>) {
     my ($extname) = $_ =~ /^.*\/(.*)\.control$/;
-
-    my $expected_extensions = "$extname\n";
+    next if ($extname eq 'plpgsql');
 
     if ($depends{$extname}) {
         for my $dep (@{$depends{$extname}}) {
             is_program_out 'postgres', "psql -qc 'CREATE EXTENSION $dep'", 0, '',
                 "$extname dependency $dep installs without error";
         }
-        $expected_extensions = join ("\n", sort ($extname, @{$depends{$extname}})) . "\n";
     }
 
     if ($extname eq 'hstore' && $v eq '9.1') {
@@ -71,8 +64,6 @@ foreach (</usr/share/postgresql/$v/extension/*.control>) {
 	    "extension $extname installs without error";
     }
 
-    is_program_out 'postgres', "psql -Atc 'SELECT extname FROM pg_extension ORDER BY extname'", 0,
-	$expected_extensions, "$extname is in pg_extension";
     is_program_out 'postgres', "psql -qc 'DROP EXTENSION \"$extname\"'", 0, '',
 	"extension $extname removes without error";