diff options
| author | WilliButz <wbutz@cyberfnord.de> | 2019-11-06 16:45:57 +0100 |
|---|---|---|
| committer | WilliButz <wbutz@cyberfnord.de> | 2019-11-07 11:30:02 +0100 |
| commit | 336bffae6dbcd7abbdd2518cc1303485da2140c7 (patch) | |
| tree | 63f737565d15a4c343d43b17bf268a0e25655ea9 /nixos/tests/pgjwt.nix | |
| parent | ff4e86f4a5363c811ab1362e8ea38e86fa762f36 (diff) | |
| download | nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.tar nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.tar.gz nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.tar.bz2 nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.tar.lz nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.tar.xz nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.tar.zst nixpkgs-336bffae6dbcd7abbdd2518cc1303485da2140c7.zip | |
nixos/tests/pgjwt: port to python
Diffstat (limited to 'nixos/tests/pgjwt.nix')
| -rw-r--r-- | nixos/tests/pgjwt.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index a2d81288c81..4793a3e3150 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -1,12 +1,5 @@ -import ./make-test.nix ({ pkgs, lib, ...}: -let - test = with pkgs; runCommand "patch-test" { - nativeBuildInputs = [ pgjwt ]; - } - '' - sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out; - ''; -in +import ./make-test-python.nix ({ pkgs, lib, ...}: + with pkgs; { name = "pgjwt"; meta = with lib.maintainers; { @@ -29,9 +22,13 @@ with pkgs; { pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}"; in '' - startAll; - $master->waitForUnit("postgresql"); - $master->copyFileFromHost("${test}","/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"); + 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" + ) + master.succeed( + "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql" + ) ''; }) |