Unverified Commit 38d86e47 authored by Piotr Kwiecinski's avatar Piotr Kwiecinski
Browse files

nixosTests.calibre-server: migrate to runTest 

Part of #386873
parent 0aa6ecb0

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ in 
  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; };

nixos/tests/calibre-server.nix

+4 −5
Original line number Diff line number Diff line 
{

  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
@@ -74,7 +73,7 @@ let 
in

mapAttrs (

  test: testConfig:

  (makeTest (

  (runTest (

    let

      nodeName = testConfig.nodeName or test;

      calibreConfig = {