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

nixosTests.nginx{http3,unix-socket,variants}: migrate to runTest (#394652)

parents 494c90cb 0839b7db

nixos/tests/all-tests.nix

+3 −3
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ in { 
  nginx-etag = runTest ./nginx-etag.nix;

  nginx-etag-compression = runTest ./nginx-etag-compression.nix;

  nginx-globalredirect = runTest ./nginx-globalredirect.nix;

  nginx-http3 = handleTest ./nginx-http3.nix {};

  nginx-http3 = import ./nginx-http3.nix { inherit pkgs runTest; };

  nginx-mime = runTest ./nginx-mime.nix;

  nginx-modsecurity = runTest ./nginx-modsecurity.nix;

  nginx-moreheaders = runTest ./nginx-moreheaders.nix;
@@ -813,8 +813,8 @@ in { 
  nginx-sso = runTest ./nginx-sso.nix;

  nginx-status-page = runTest ./nginx-status-page.nix;

  nginx-tmpdir = runTest ./nginx-tmpdir.nix;

  nginx-unix-socket = handleTest ./nginx-unix-socket.nix {};

  nginx-variants = handleTest ./nginx-variants.nix {};

  nginx-unix-socket = runTest ./nginx-unix-socket.nix;

  nginx-variants = import ./nginx-variants.nix { inherit pkgs runTest; };

  nifi = runTestOn ["x86_64-linux"] ./web-apps/nifi.nix;

  nitter = handleTest ./nitter.nix {};

  nix-config = handleTest ./nix-config.nix {};

nixos/tests/nginx-http3.nix

+2 −10
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

  config ? { },

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

}:



with import ../lib/testing-python.nix { inherit system pkgs; };



{ pkgs, runTest, ... }:

let

  hosts = ''

    192.168.2.101 acme.test

  '';



in



builtins.listToAttrs (

  builtins.map

    (nginxPackage: {

      name = pkgs.lib.getName nginxPackage;

      value = makeTest {

      value = runTest {

        name = "nginx-http3-${pkgs.lib.getName nginxPackage}";

        meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

nixos/tests/nginx-unix-socket.nix

+24 −26
Original line number Diff line number Diff line 
import ./make-test-python.nix (

  { pkgs, ... }:

{ ... }:

let

  nginxSocketPath = "/var/run/nginx/test.sock";

in
@@ -28,4 +27,3 @@ import ./make-test-python.nix ( 
    webserver.succeed("curl --fail --silent --unix-socket '${nginxSocketPath}' http://localhost/test | grep '^foo$'")

  '';

}
 
)

nixos/tests/nginx-variants.nix

+2 −9
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

  config ? { },

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

}:



with import ../lib/testing-python.nix { inherit system pkgs; };



{ pkgs, runTest, ... }:

builtins.listToAttrs (

  builtins.map

    (nginxPackage: {

      name = pkgs.lib.getName nginxPackage;

      value = makeTest {

      value = runTest {

        name = "nginx-variant-${pkgs.lib.getName nginxPackage}";



        nodes.machine =