From b3f70ee9f5a355ee2f17247ef6938110e2671413 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 30 Mar 2025 18:00:36 +0200 Subject: [PATCH] nixosTests.nginx-variants: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/nginx-variants.nix | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dd5991a365d0..bd30f9b092cc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -814,7 +814,7 @@ in { nginx-status-page = runTest ./nginx-status-page.nix; nginx-tmpdir = runTest ./nginx-tmpdir.nix; nginx-unix-socket = runTest ./nginx-unix-socket.nix; - nginx-variants = handleTest ./nginx-variants.nix {}; + nginx-variants = import ./nginx-variants.nix { inherit pkgs runTest; }; nifi = runTestOn ["x86_64-linux"] ./web-apps/nifi.nix; nitter = handleTest ./nitter.nix {}; nix-config = handleTest ./nix-config.nix {}; diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix index 905c94730d73..c5bc6b1ab062 100644 --- a/nixos/tests/nginx-variants.nix +++ b/nixos/tests/nginx-variants.nix @@ -1,16 +1,9 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - +{ pkgs, runTest, ... }: builtins.listToAttrs ( builtins.map (nginxPackage: { name = pkgs.lib.getName nginxPackage; - value = makeTest { + value = runTest { name = "nginx-variant-${pkgs.lib.getName nginxPackage}"; nodes.machine =