diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d042d51dccf3..a839926b8cf7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -486,7 +486,7 @@ in fedimintd = runTest ./fedimintd.nix; fenics = runTest ./fenics.nix; ferm = runTest ./ferm.nix; - ferretdb = handleTest ./ferretdb.nix { }; + ferretdb = import ./ferretdb.nix { inherit pkgs runTest; }; fider = runTest ./fider.nix; filesender = runTest ./filesender.nix; filebrowser = runTest ./filebrowser.nix; diff --git a/nixos/tests/ferretdb.nix b/nixos/tests/ferretdb.nix index cfa01b132231..8013db64d056 100644 --- a/nixos/tests/ferretdb.nix +++ b/nixos/tests/ferretdb.nix @@ -1,10 +1,6 @@ -{ - system ? builtins.currentSystem, - pkgs ? import ../.. { inherit system; }, - ... -}: +{ runTest, pkgs }: let - lib = pkgs.lib; + inherit (pkgs) lib; testScript = '' machine.start() machine.wait_for_unit("ferretdb.service") @@ -12,10 +8,8 @@ let machine.succeed("mongosh --eval 'use myNewDatabase;' --eval 'db.myCollection.insertOne( { x: 1 } );'") ''; in -with import ../lib/testing-python.nix { inherit system; }; { - - postgresql = makeTest { + postgresql = runTest { inherit testScript; name = "ferretdb-postgresql"; meta.maintainers = with lib.maintainers; [ julienmalka ]; @@ -47,8 +41,7 @@ with import ../lib/testing-python.nix { inherit system; }; environment.systemPackages = with pkgs; [ mongosh ]; }; }; - - sqlite = makeTest { + sqlite = runTest { inherit testScript; name = "ferretdb-sqlite"; meta.maintainers = with lib.maintainers; [ julienmalka ];