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

nixosTests.proxyprotocol: migrate to runTest

Browse source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-03-30 03:22:00 +02:00
parent f021a4b13c
commit cfb69d81fa
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 146 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -807,7 +807,7 @@ in {
nginx-modsecurity = runTest ./nginx-modsecurity.nix; nginx-modsecurity = runTest ./nginx-modsecurity.nix;
nginx-moreheaders = runTest ./nginx-moreheaders.nix; nginx-moreheaders = runTest ./nginx-moreheaders.nix;
nginx-njs = handleTest ./nginx-njs.nix {}; nginx-njs = handleTest ./nginx-njs.nix {};
nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nginx-proxyprotocol = runTest ./nginx-proxyprotocol/default.nix;
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
nginx-redirectcode = handleTest ./nginx-redirectcode.nix {}; nginx-redirectcode = handleTest ./nginx-redirectcode.nix {};
nginx-sso = handleTest ./nginx-sso.nix {}; nginx-sso = handleTest ./nginx-sso.nix {};

8
nixos/tests/nginx-proxyprotocol/default.nix
View file

@ -1,9 +1,8 @@
let let
certs = import ./snakeoil-certs.nix; certs = import ./snakeoil-certs.nix;
in in
import ../make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: {
{
name = "nginx-proxyprotocol"; name = "nginx-proxyprotocol";
meta = { meta = {
@ -160,5 +159,4 @@ import ../make-test-python.nix (
# spoof("1.1.1.1", "127.0.0.4", "direct-nossl.test.nix") # spoof("1.1.1.1", "127.0.0.4", "direct-nossl.test.nix")
# spoof("1.1.1.1", "127.0.0.4", "unsecure-nossl.test.nix", expect_failure=False) # spoof("1.1.1.1", "127.0.0.4", "unsecure-nossl.test.nix", expect_failure=False)
''; '';
} }
)