fix: remove redundant postgresqlWithExtension wrapper in extension tests

jfroche · jfroche · commit 6dba03c55d26 · 2025-12-22T17:11:42.000+01:00
The tests were unnecessarily wrapping psql_15 with postgresqlWithExtension when psql_15 already includes the extensions.
diff --git a/nix/ext/tests/pg_plan_filter.nix b/nix/ext/tests/pg_plan_filter.nix
@@ -55,7 +55,7 @@ pkgs.testers.runNixOSTest {
     {
       services.postgresql = {
         enable = true;
-        package = (postgresqlWithExtension psql_15);
+        package = psql_15;
         settings = (installedExtension "15").defaultSettings or { };
       };
 
diff --git a/nix/ext/tests/pg_safeupdate.nix b/nix/ext/tests/pg_safeupdate.nix
@@ -55,7 +55,7 @@ pkgs.testers.runNixOSTest {
     {
       services.postgresql = {
         enable = true;
-        package = (postgresqlWithExtension psql_15);
+        package = psql_15;
         settings = (installedExtension "15").defaultSettings or { };
       };
 
diff --git a/nix/ext/tests/pgmq.nix b/nix/ext/tests/pgmq.nix
@@ -49,13 +49,13 @@ let
       self.packages.${pkgs.pkgsLinux.stdenv.hostPlatform.system}.postgresql_17;
 in
 pkgs.testers.runNixOSTest {
-  name = "timescaledb";
+  name = "pgmq";
   nodes.server =
     { config, ... }:
     {
       services.postgresql = {
         enable = true;
-        package = (postgresqlWithExtension psql_15);
+        package = psql_15;
         authentication = ''
           local all postgres peer map=postgres
           local all all peer map=root
diff --git a/nix/ext/tests/timescaledb.nix b/nix/ext/tests/timescaledb.nix
@@ -52,7 +52,7 @@ pkgs.testers.runNixOSTest {
     {
       services.postgresql = {
         enable = true;
-        package = (postgresqlWithExtension psql_15);
+        package = psql_15;
         authentication = ''
           local all postgres peer map=postgres
           local all all peer map=root

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ pkgs.testers.runNixOSTest {`
`55`	`55`	`{`
`56`	`56`	`services.postgresql = {`
`57`	`57`	`enable = true;`
`58`		`- package = (postgresqlWithExtension psql_15);`
	`58`	`+ package = psql_15;`
`59`	`59`	`settings = (installedExtension "15").defaultSettings or { };`
`60`	`60`	`};`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ pkgs.testers.runNixOSTest {`
`52`	`52`	`{`
`53`	`53`	`services.postgresql = {`
`54`	`54`	`enable = true;`
`55`		`- package = (postgresqlWithExtension psql_15);`
	`55`	`+ package = psql_15;`
`56`	`56`	`authentication = ''`
`57`	`57`	`local all postgres peer map=postgres`
`58`	`58`	`local all all peer map=root`