Unverified Commit c01965bd authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

nixosTests.varnish{75,76,60}: migrate to runTest (#394659)

parents 55bfb51d 26497c83

nixos/tests/all-tests.nix

+12 −3
Original line number Diff line number Diff line
@@ -1277,9 +1277,18 @@ in { 
  ustreamer = handleTest ./ustreamer.nix {};

  uwsgi = handleTest ./uwsgi.nix {};

  v2ray = handleTest ./v2ray.nix {};

  varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };

  varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };

  varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };

  varnish60 = runTest {

    imports = [ ./varnish.nix ];

    _module.args.package = pkgs.varnish60;

  };

  varnish75 = runTest {

    imports = [ ./varnish.nix ];

    _module.args.package = pkgs.varnish75;

  };

  varnish76 = runTest {

    imports = [ ./varnish.nix ];

    _module.args.package = pkgs.varnish76;

  };

  vault = handleTest ./vault.nix {};

  vault-agent = handleTest ./vault-agent.nix {};

  vault-dev = handleTest ./vault-dev.nix {};

nixos/tests/varnish.nix

+51 −58
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

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

  package,

}:

import ./make-test-python.nix (

  { pkgs, lib, ... }:

{ pkgs, package, ... }:

let

  testPath = pkgs.hello;

in
@@ -64,4 +58,3 @@ import ./make-test-python.nix ( 
    assert "Child in state running" in output, "Unexpected varnishadm response"

  '';

}
 
)