diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8e83095a7ded..e290d323c875 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1233,7 +1233,7 @@ in stargazer = runTest ./web-servers/stargazer.nix; starship = runTest ./starship.nix; stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { }; - static-web-server = handleTest ./web-servers/static-web-server.nix { }; + static-web-server = runTest ./web-servers/static-web-server.nix; step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { }; stratis = handleTest ./stratis { }; strongswan-swanctl = handleTest ./strongswan-swanctl.nix { }; diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix index 1c88e70a0957..0727b5cba021 100644 --- a/nixos/tests/web-servers/static-web-server.nix +++ b/nixos/tests/web-servers/static-web-server.nix @@ -1,41 +1,39 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "static-web-server"; - meta = { - maintainers = with lib.maintainers; [ mac-chaffee ]; - }; +{ pkgs, lib, ... }: +{ + name = "static-web-server"; + meta = { + maintainers = with lib.maintainers; [ mac-chaffee ]; + }; - nodes.machine = - { pkgs, ... }: - { - services.static-web-server = { - enable = true; - listen = "[::]:8080"; - root = toString ( - pkgs.writeTextDir "nixos-test.html" '' -

Hello NixOS!

- '' - ); - configuration = { - general = { - directory-listing = true; - }; + nodes.machine = + { pkgs, ... }: + { + services.static-web-server = { + enable = true; + listen = "[::]:8080"; + root = toString ( + pkgs.writeTextDir "nixos-test.html" '' +

Hello NixOS!

+ '' + ); + configuration = { + general = { + directory-listing = true; }; }; }; + }; - testScript = '' - machine.start() - machine.wait_for_unit("static-web-server.socket") - machine.wait_for_open_port(8080) - # We don't use wait_until_succeeds() because we're testing socket - # activation which better work on the first request - response = machine.succeed("curl -fsS localhost:8080") - assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" - response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") - assert "Hello NixOS!" in response - machine.wait_for_unit("static-web-server.service") - ''; - } -) + testScript = '' + machine.start() + machine.wait_for_unit("static-web-server.socket") + machine.wait_for_open_port(8080) + # We don't use wait_until_succeeds() because we're testing socket + # activation which better work on the first request + response = machine.succeed("curl -fsS localhost:8080") + assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" + response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") + assert "Hello NixOS!" in response + machine.wait_for_unit("static-web-server.service") + ''; +}