From 00ce4be9e427ba08b6b702736c8c255d867ccc84 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 11 Sep 2024 08:11:18 +0300 Subject: [PATCH] nixos/tests/pgjwt: fix test - remove extra 'CREATE EXTENSION' statements added with sed to test.sql, current test.sql already has them. - change 'nodes.master.config' to 'nodes.master' according to eval warn: evaluation warning: Module argument `nodes.master.config` is deprecated. Use `nodes.master` instead. --- nixos/tests/pgjwt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index 8d3310b74eb3..0df6c4d62d28 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -18,14 +18,14 @@ with pkgs; { testScript = { nodes, ... }: let - sqlSU = "${nodes.master.config.services.postgresql.superUser}"; + sqlSU = "${nodes.master.services.postgresql.superUser}"; pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; in '' start_all() master.wait_for_unit("postgresql") master.succeed( - "${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql" + "${pkgs.gnused}/bin/sed -e '12 i SET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql" ) master.succeed( "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"