movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

postgresql: add passthru.tests.postgresql

Browse source 
Restructuring the nixosTests.postgresql test a little bit to allow
calling it with the specific versioned package from generic.nix.
This commit is contained in:
Wolfgang Walther 2024-11-01 19:29:09 +01:00
parent 319d82d5c2
commit f6c2de9262
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
nixos/tests/postgresql.nix
View file

@ -7,7 +7,13 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib; with pkgs.lib;
let let
postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; testsForPackage = package:
recurseIntoAttrs {
postgresql = make-postgresql-test package false;
postgresql-backup-all = make-postgresql-test package true;
postgresql-clauses = mk-ensure-clauses-test package;
};
test-sql = pkgs.writeText "postgresql-test" '' test-sql = pkgs.writeText "postgresql-test" ''
CREATE EXTENSION pgcrypto; -- just to check if lib loading works CREATE EXTENSION pgcrypto; -- just to check if lib loading works
CREATE TABLE sth ( CREATE TABLE sth (
@ -21,8 +27,9 @@ let
CREATE TABLE xmltest ( doc xml ); CREATE TABLE xmltest ( doc xml );
INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled
''; '';
make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest {
name = postgresql-name; make-postgresql-test = postgresql-package: backup-all: makeTest {
name = "postgresql${optionalString backup-all "-backup-all"}-${postgresql-package.name}";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ zagy ]; maintainers = [ zagy ];
}; };
@ -133,8 +140,8 @@ let
}; };
mk-ensure-clauses-test = postgresql-name: postgresql-package: makeTest { mk-ensure-clauses-test = postgresql-package: makeTest {
name = postgresql-name; name = "postgresql-clauses-${postgresql-package.name}";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ zagy ]; maintainers = [ zagy ];
}; };
@ -219,8 +226,7 @@ let
''; '';
}; };
in in
concatMapAttrs (name: package: { concatMapAttrs (n: p: { ${n} = testsForPackage p; }) pkgs.postgresqlVersions
${name} = make-postgresql-test name package false; // {
${name + "-backup-all"} = make-postgresql-test "${name + "-backup-all"}" package true; passthru.override = p: testsForPackage p;
${name + "-clauses"} = mk-ensure-clauses-test name package; }
}) postgresql-versions

1
pkgs/servers/sql/postgresql/generic.nix
View file

@ -312,6 +312,7 @@ let
}; };
tests = { tests = {
postgresql = nixosTests.postgresql.passthru.override finalAttrs.finalPackage;
postgresql-wal-receiver = nixosTests.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage; postgresql-wal-receiver = nixosTests.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
} // lib.optionalAttrs jitSupport { } // lib.optionalAttrs jitSupport {