Unverified Commit 6ac38abf authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

nixos/tests/envoy: migrate to runTests

parent d237b509

nixos/tests/all-tests.nix

+4 −1
Original line number Diff line number Diff line
@@ -407,7 +407,10 @@ in 
  enlightenment = handleTest ./enlightenment.nix { };

  env = handleTest ./env.nix { };

  envfs = handleTest ./envfs.nix { };

  envoy = handleTest ./envoy.nix { };

  envoy = runTest {

    imports = [ ./envoy.nix ];

    _module.args.envoyPackage = pkgs.envoy;

  };

  ergo = handleTest ./ergo.nix { };

  ergochat = handleTest ./ergochat.nix { };

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

nixos/tests/envoy.nix

+53 −55
Original line number Diff line number Diff line 
import ./make-test-python.nix (

  { pkgs, lib, ... }:

{ envoyPackage, lib, ... }:

{

    name = "envoy";

    meta = with pkgs.lib.maintainers; {

  name = envoyPackage.pname;



  meta = with lib.maintainers; {

    maintainers = [ cameronnemo ];

  };



    nodes.machine =

      { pkgs, ... }:

      {

  nodes.machine = {

    services.envoy.enable = true;

    services.envoy.package = envoyPackage;

    services.envoy.settings = {

      admin = {

        access_log_path = "/dev/null";
@@ -59,4 +58,3 @@ import ./make-test-python.nix ( 
        machine.succeed('test -f /var/log/envoy/access.log')

    '';

}
 
)