Unverified Commit 90355738 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

nixosTests.postgresql: move all postgresql related nixosTests into one folder 

This makes it possible to run all those tests at once by building
nixosTests.postgresql and allow a simple entry to ci/OWNERS for all
tests.
parent db2d6a00

ci/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/servers/sql/postgresql @NixOS/postgres

/nixos/modules/services/databases/postgresql.md @NixOS/postgres

/nixos/modules/services/databases/postgresql.nix @NixOS/postgres

/nixos/tests/postgresql.nix @NixOS/postgres

/nixos/tests/postgresql @NixOS/postgres



# Hardened profile & related modules

/nixos/modules/profiles/hardened.nix                       @joachifm

nixos/tests/all-tests.nix

+1 −10
Original line number Diff line number Diff line
@@ -775,13 +775,10 @@ in { 
  peering-manager = handleTest ./web-apps/peering-manager.nix {};

  peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {};

  peroxide = handleTest ./peroxide.nix {};

  pg_anonymizer = handleTest ./pg_anonymizer.nix {};

  pgadmin4 = handleTest ./pgadmin4.nix {};

  pgbouncer = handleTest ./pgbouncer.nix {};

  pghero = runTest ./pghero.nix;

  pgjwt = handleTest ./pgjwt.nix {};

  pgmanage = handleTest ./pgmanage.nix {};

  pgvecto-rs = handleTest ./pgvecto-rs.nix {};

  phosh = handleTest ./phosh.nix {};

  photonvision = handleTest ./photonvision.nix {};

  photoprism = handleTest ./photoprism.nix {};
@@ -814,11 +811,7 @@ in { 
  postfix = handleTest ./postfix.nix {};

  postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};

  postfixadmin = handleTest ./postfixadmin.nix {};

  postgresql = handleTest ./postgresql.nix {};

  postgresql-jit = handleTest ./postgresql-jit.nix {};

  postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};

  postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {};

  postgresql-wal2json = handleTest ./postgresql-wal2json.nix {};

  postgresql = handleTest ./postgresql {};

  powerdns = handleTest ./powerdns.nix {};

  powerdns-admin = handleTest ./powerdns-admin.nix {};

  power-profiles-daemon = handleTest ./power-profiles-daemon.nix {};
@@ -1045,7 +1038,6 @@ in { 
  tiddlywiki = handleTest ./tiddlywiki.nix {};

  tigervnc = handleTest ./tigervnc.nix {};

  tika = runTest ./tika.nix;

  timescaledb = handleTest ./timescaledb.nix {};

  timezone = handleTest ./timezone.nix {};

  timidity = handleTestOn ["aarch64-linux" "x86_64-linux"] ./timidity {};

  tinc = handleTest ./tinc {};
@@ -1065,7 +1057,6 @@ in { 
  trezord = handleTest ./trezord.nix {};

  trickster = handleTest ./trickster.nix {};

  trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};

  tsja = handleTest ./tsja.nix {};

  tsm-client-gui = handleTest ./tsm-client-gui.nix {};

  ttyd = handleTest ./web-servers/ttyd.nix {};

  txredisapi = handleTest ./txredisapi.nix {};

nixos/tests/pg_anonymizer.nix→nixos/tests/postgresql/anonymizer.nix

+9 −10
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem

, config ? {}

, pkgs ? import ../.. { inherit system config; }

{ pkgs

, makeTest

}:



with import ../lib/testing-python.nix { inherit system pkgs; };



let

  inherit (pkgs) lib;



  makeAnonymizerTest = postgresqlPackage:

    makeTest {

      name = "pg_anonymizer-${postgresqlPackage.name}";

      name = "postgresql_anonymizer-${postgresqlPackage.name}";

      meta.maintainers = lib.teams.flyingcircus.members;



      nodes.machine = { pkgs, ... }: {
@@ -105,7 +102,9 @@ let 
      '';

    };

in

pkgs.lib.recurseIntoAttrs (

  pkgs.lib.concatMapAttrs (n: p: { ${n} = makeAnonymizerTest p; }) pkgs.postgresqlVersions

  // {

    passthru.override = p: makeAnonymizerTest p;

  }

)

nixos/tests/postgresql/default.nix

0 → 100644
+26 −0
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

  config ? { },

  pkgs ? import ../../.. { inherit system config; },

}:



with import ../../lib/testing-python.nix { inherit system pkgs; };



let

  importWithArgs = path: import path { inherit pkgs makeTest; };

in

{

  # postgresql

  postgresql = importWithArgs ./postgresql.nix;

  postgresql-jit = importWithArgs ./postgresql-jit.nix;

  postgresql-wal-receiver = importWithArgs ./postgresql-wal-receiver.nix;

  postgresql-tls-client-cert = importWithArgs ./postgresql-tls-client-cert.nix;



  # extensions

  anonymizer = importWithArgs ./anonymizer.nix;

  pgjwt = importWithArgs ./pgjwt.nix;

  pgvecto-rs = importWithArgs ./pgvecto-rs.nix;

  timescaledb = importWithArgs ./timescaledb.nix;

  tsja = importWithArgs ./tsja.nix;

  wal2json = importWithArgs ./wal2json.nix;

}

nixos/tests/pgjwt.nix→nixos/tests/postgresql/pgjwt.nix

+8 −9
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem

, config ? {}

, pkgs ? import ../.. { inherit system config; }

{ pkgs

, makeTest

}:



with import ../lib/testing-python.nix { inherit system pkgs; };



let

  inherit (pkgs) lib;
@@ -41,7 +38,9 @@ let 
      '';

    };

in

lib.recurseIntoAttrs (

  lib.concatMapAttrs (n: p: { ${n} = makePgjwtTest p; }) pkgs.postgresqlVersions

  // {

    passthru.override = p: makePgjwtTest p;

  }

)