Unverified Commit bd0b4a43 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

nixosTests.calibre-{web,server}: migrate to runTest (#396377)

parents d47b391d 38d86e47

nixos/tests/all-tests.nix

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ in 
  cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };

  cage = handleTest ./cage.nix { };

  cagebreak = handleTest ./cagebreak.nix { };

  calibre-web = handleTest ./calibre-web.nix { };

  calibre-server = handleTest ./calibre-server.nix { };

  calibre-web = runTest ./calibre-web.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 = {

nixos/tests/calibre-web.nix

+36 −38
Original line number Diff line number Diff line 
import ./make-test-python.nix (

  { pkgs, lib, ... }:

{ lib, ... }:



let

  port = 3142;
@@ -41,4 +40,3 @@ import ./make-test-python.nix ( 
    )

  '';

}
 
)