nixosTests.nginx-http3: migrate to runTest

Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-03-30 18:07:09 +02:00
parent b3f70ee9f5
commit 0839b7db77
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 3 additions and 11 deletions

View file

@ -802,7 +802,7 @@ in {
nginx-etag = runTest ./nginx-etag.nix; nginx-etag = runTest ./nginx-etag.nix;
nginx-etag-compression = runTest ./nginx-etag-compression.nix; nginx-etag-compression = runTest ./nginx-etag-compression.nix;
nginx-globalredirect = runTest ./nginx-globalredirect.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-mime = runTest ./nginx-mime.nix;
nginx-modsecurity = runTest ./nginx-modsecurity.nix; nginx-modsecurity = runTest ./nginx-modsecurity.nix;
nginx-moreheaders = runTest ./nginx-moreheaders.nix; nginx-moreheaders = runTest ./nginx-moreheaders.nix;

View file

@ -1,23 +1,15 @@
{ { pkgs, runTest, ... }:
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
let let
hosts = '' hosts = ''
192.168.2.101 acme.test 192.168.2.101 acme.test
''; '';
in in
builtins.listToAttrs ( builtins.listToAttrs (
builtins.map builtins.map
(nginxPackage: { (nginxPackage: {
name = pkgs.lib.getName nginxPackage; name = pkgs.lib.getName nginxPackage;
value = makeTest { value = runTest {
name = "nginx-http3-${pkgs.lib.getName nginxPackage}"; name = "nginx-http3-${pkgs.lib.getName nginxPackage}";
meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];