nixosTests.calibre-server: migrate to runTest

Part of #386873

Changed files
+5 -6
nixos
+1 -1
nixos/tests/all-tests.nix
···
cage = handleTest ./cage.nix { };
cagebreak = handleTest ./cagebreak.nix { };
calibre-web = runTest ./calibre-web.nix;
-
calibre-server = handleTest ./calibre-server.nix { };
+
calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
canaille = handleTest ./canaille.nix { };
castopod = handleTest ./castopod.nix { };
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
+4 -5
nixos/tests/calibre-server.nix
···
{
-
system ? builtins.currentSystem,
-
config ? { },
-
pkgs ? import ../.. { inherit system config; },
+
pkgs,
+
runTest,
+
...
}:
let
-
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib)
concatStringsSep
maintainers
···
in
mapAttrs (
test: testConfig:
-
(makeTest (
+
(runTest (
let
nodeName = testConfig.nodeName or test;
calibreConfig = {