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

nixosTests.nginx{auth,etag,etag-compression,globalredirect,mime,modsecurity,mo... 

nixosTests.nginx{auth,etag,etag-compression,globalredirect,mime,modsecurity,moreheaders}: migrate to runTest (#394455)
parents bd05b64b 1e0be03f

nixos/tests/all-tests.nix

+8 −8
Original line number Diff line number Diff line
@@ -797,15 +797,15 @@ in { 
  nfs3 = handleTest ./nfs { version = 3; };

  nfs4 = handleTest ./nfs { version = 4; };

  nghttpx = handleTest ./nghttpx.nix {};

  nginx = handleTest ./nginx.nix {};

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

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

  nginx-etag-compression = handleTest ./nginx-etag-compression.nix {};

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

  nginx = runTest ./nginx.nix;

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

  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-mime = handleTest ./nginx-mime.nix {};

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

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

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

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

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

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

  nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};

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

nixos/tests/nginx-auth.nix

+44 −46
Original line number Diff line number Diff line 
import ./make-test-python.nix (

{ pkgs, ... }:

{

  name = "nginx-auth";
@@ -51,4 +50,3 @@ import ./make-test-python.nix ( 
    )

  '';

}
 
)

nixos/tests/nginx-etag-compression.nix

+2 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix {

{ ... }:

{

  name = "nginx-etag-compression";



  nodes.machine =

nixos/tests/nginx-etag.nix

+3 −2
Original line number Diff line number Diff line 
import ./make-test-python.nix {

{ ... }:

{

  name = "nginx-etag";



  nodes = {
@@ -85,7 +86,7 @@ import ./make-test-python.nix { 
  testScript =

    { nodes, ... }:

    let

      inherit (nodes.server.config.system.build) toplevel;

      inherit (nodes.server.system.build) toplevel;

      newSystem = "${toplevel}/specialisation/pass-checks";

    in

    ''

nixos/tests/nginx-globalredirect.nix

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

  { pkgs, ... }:

{ ... }:

{

  name = "nginx-globalredirect";
@@ -26,4 +25,3 @@ import ./make-test-python.nix ( 
    webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")

  '';

}
 
)