From 4633acf70e6c8142b718ace096b9136558a8685a Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 7 Jun 2025 19:28:23 +0800 Subject: [PATCH] nixosTests.certmgr: handleTest -> runTest --- nixos/tests/all-tests.nix | 2 +- nixos/tests/certmgr.nix | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c355cd82f5e8..75614efdd4c3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -305,7 +305,7 @@ in "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore-dmcrypt.nix; - certmgr = handleTest ./certmgr.nix { }; + certmgr = import ./certmgr.nix { inherit pkgs runTest; }; cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { }; cgit = runTest ./cgit.nix; charliecloud = runTest ./charliecloud.nix; diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix index 5f92e2cad963..1a78e3150d8b 100644 --- a/nixos/tests/certmgr.nix +++ b/nixos/tests/certmgr.nix @@ -1,10 +1,5 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: +{ runTest, pkgs, ... }: -with import ../lib/testing-python.nix { inherit system pkgs; }; let mkSpec = { @@ -63,7 +58,7 @@ let specs, testScript, }: - makeTest { + runTest { name = "certmgr-" + svcManager; nodes = { machine =