movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.nginx-redirectcode: migrate to runTest

Browse source
This commit is contained in:
Piotr Kwiecinski 2025-03-30 03:31:10 +02:00
parent c0d90aca81
commit 7a830b19d7
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -809,7 +809,7 @@ in {
nginx-njs = handleTest ./nginx-njs.nix {}; nginx-njs = handleTest ./nginx-njs.nix {};
nginx-proxyprotocol = runTest ./nginx-proxyprotocol/default.nix; nginx-proxyprotocol = runTest ./nginx-proxyprotocol/default.nix;
nginx-pubhtml = runTest ./nginx-pubhtml.nix; nginx-pubhtml = runTest ./nginx-pubhtml.nix;
nginx-redirectcode = handleTest ./nginx-redirectcode.nix {}; nginx-redirectcode = runTest ./nginx-redirectcode.nix;
nginx-sso = handleTest ./nginx-sso.nix {}; nginx-sso = handleTest ./nginx-sso.nix {};
nginx-status-page = handleTest ./nginx-status-page.nix {}; nginx-status-page = handleTest ./nginx-status-page.nix {};
nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; nginx-tmpdir = handleTest ./nginx-tmpdir.nix {};

48
nixos/tests/nginx-redirectcode.nix
View file

@ -1,30 +1,28 @@
import ./make-test-python.nix ( { lib, ... }:
{ pkgs, lib, ... }: {
{ name = "nginx-redirectcode";
name = "nginx-redirectcode"; meta.maintainers = with lib.maintainers; [ misterio77 ];
meta.maintainers = with lib.maintainers; [ misterio77 ];
nodes = { nodes = {
webserver = webserver =
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts.localhost = { virtualHosts.localhost = {
globalRedirect = "example.com/foo"; globalRedirect = "example.com/foo";
# With 308 (and 307), the method and body are to be kept when following it # With 308 (and 307), the method and body are to be kept when following it
redirectCode = 308; redirectCode = 308;
};
}; };
}; };
}; };
};
testScript = '' testScript = ''
webserver.wait_for_unit("nginx") webserver.wait_for_unit("nginx")
webserver.wait_for_open_port(80) webserver.wait_for_open_port(80)
# Check the status code # Check the status code
webserver.succeed("curl -si http://localhost | grep '^HTTP/[0-9.]\+ 308 Permanent Redirect'") webserver.succeed("curl -si http://localhost | grep '^HTTP/[0-9.]\+ 308 Permanent Redirect'")
''; '';
} }
)