Merge pull request #29927 from WilliButz/fix-pgjwt-test

nixos/tests: fix pgjwt test

Changed files
+69 -35
nixos
tests
pkgs
servers
sql
postgresql
pgjwt
pgtap
top-level
+28 -28
nixos/tests/pgjwt.nix
···
-
import ./make-test.nix ({ pkgs, ...} :
let
-
test = pkgs.writeText "test.sql" ''
-
CREATE EXTENSION pgcrypto;
-
CREATE EXTENSION pgjwt;
-
select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret');
-
select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret');
'';
in
-
{
name = "pgjwt";
-
meta = with pkgs.stdenv.lib.maintainers; {
-
maintainers = [ spinus ];
};
nodes = {
-
master =
-
{ pkgs, config, ... }:
-
-
{
-
services.postgresql = let mypg = pkgs.postgresql95; in {
-
enable = true;
-
package = mypg;
-
extraPlugins =[pkgs.pgjwt];
-
initialScript = pkgs.writeText "postgresql-init.sql"
-
''
-
CREATE ROLE postgres WITH superuser login createdb;
-
'';
-
};
};
};
-
testScript = ''
startAll;
$master->waitForUnit("postgresql");
-
$master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'");
-
$master->succeed("cat ${test} | psql postgres");
-
# I can't make original test working :[
-
# $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql");
-
'';
})
···
+
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
+
with pkgs; {
name = "pgjwt";
+
meta = with lib.maintainers; {
+
maintainers = [ spinus willibutz ];
};
nodes = {
+
master = { pkgs, config, ... }:
+
{
+
services.postgresql = {
+
enable = true;
+
package = postgresql96;
+
extraPlugins = [ pgjwt pgtap ];
+
initialScript = writeText "postgresql-init.sql"
+
''
+
CREATE ROLE postgres WITH superuser login createdb;
+
'';
};
+
};
};
+
testScript = { nodes, ... }:
+
let
+
sqlSU = "${nodes.master.config.services.postgresql.superUser}";
+
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");
'';
})
+3 -3
pkgs/servers/sql/postgresql/pgjwt/default.nix
···
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "pgjwt-${version}";
-
version = "0.0.1";
src = fetchFromGitHub {
owner = "michelp";
repo = "pgjwt";
-
rev = "12a41eef15e6d3a22399e03178560d5174d496a3";
-
sha256 = "1dgx7kqkf9d7j5qj3xykx238xm8jg0s6c8h7zyl4lx8dmbz9sgsv";
};
dontBuild = true;
installPhase = ''
···
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "pgjwt-${version}";
+
version = "unstable-2017-04-24";
src = fetchFromGitHub {
owner = "michelp";
repo = "pgjwt";
+
rev = "546a2911027b716586e241be7fd4c6f1785237cd";
+
sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf";
};
dontBuild = true;
installPhase = ''
+32
pkgs/servers/sql/postgresql/pgtap/default.nix
···
···
+
{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }:
+
+
stdenv.mkDerivation rec {
+
name = "pgtap-${version}";
+
version = "0.97.0";
+
+
src = fetchFromGitHub {
+
owner = "theory";
+
repo = "pgtap";
+
rev = "v${version}";
+
sha256 = "1vzc8pxzi0rbywmrvx7i5awngsvzcz75i4jl9bk2vqr223chax6f";
+
};
+
+
nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];
+
+
installPhase = ''
+
install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/extension
+
'';
+
+
meta = with stdenv.lib; {
+
description = "pgTAP is a unit testing framework for PostgreSQL";
+
longDescription = ''
+
pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL.
+
It includes a comprehensive collection of TAP-emitting assertion functions,
+
as well as the ability to integrate with other TAP-emitting test frameworks.
+
It can also be used in the xUnit testing style.
+
'';
+
maintainers = with maintainers; [ willibutz ];
+
homepage = http://pgtap.org;
+
inherit (postgresql.meta) platforms;
+
};
+
}
+2
pkgs/top-level/all-packages.nix
···
pgjwt = callPackage ../servers/sql/postgresql/pgjwt {};
pigz = callPackage ../tools/compression/pigz { };
pixz = callPackage ../tools/compression/pixz { };
···
pgjwt = callPackage ../servers/sql/postgresql/pgjwt {};
+
pgtap = callPackage ../servers/sql/postgresql/pgtap {};
+
pigz = callPackage ../tools/compression/pigz { };
pixz = callPackage ../tools/compression/pixz { };
+4 -4
pkgs/top-level/perl-packages.nix
···
};
};
-
TAPParserSourceHandlerpgTAP = buildPerlModule {
-
name = "TAP-Parser-SourceHandler-pgTAP-3.30";
src = fetchurl {
-
url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.30.tar.gz;
-
sha256 = "08gadqf898r23sx07sn13555cp9zkwp8igjlh1fza2ycfivpfl9f";
};
meta = {
homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/;
···
};
};
+
TAPParserSourceHandlerpgTAP = buildPerlModule rec {
+
name = "TAP-Parser-SourceHandler-pgTAP-3.33";
src = fetchurl {
+
url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
+
sha256 = "35q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k";
};
meta = {
homepage = http://search.cpan.org/dist/Tap-Parser-Sourcehandler-pgTAP/;