From 0839b7db77846af0d5f4a8b4d1646ebe664006f2 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 30 Mar 2025 18:07:09 +0200 Subject: [PATCH] nixosTests.nginx-http3: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/nginx-http3.nix | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bd30f9b092cc..0555135b6ec2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -802,7 +802,7 @@ in { 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-http3 = import ./nginx-http3.nix { inherit pkgs runTest; }; nginx-mime = runTest ./nginx-mime.nix; nginx-modsecurity = runTest ./nginx-modsecurity.nix; nginx-moreheaders = runTest ./nginx-moreheaders.nix; diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix index d9f4b072f25e..1d6cd56294be 100644 --- a/nixos/tests/nginx-http3.nix +++ b/nixos/tests/nginx-http3.nix @@ -1,23 +1,15 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - +{ pkgs, runTest, ... }: let hosts = '' 192.168.2.101 acme.test ''; in - builtins.listToAttrs ( builtins.map (nginxPackage: { name = pkgs.lib.getName nginxPackage; - value = makeTest { + value = runTest { name = "nginx-http3-${pkgs.lib.getName nginxPackage}"; meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];