From 924b4f9c649a1b8ffe15ab7d59a28bcac0522c9b Mon Sep 17 00:00:00 2001 From: e1mo Date: Fri, 28 Mar 2025 14:06:50 +0100 Subject: [PATCH] nixosTests.dokuwiki: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/dokuwiki.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 27124bb953d7..979d31f82355 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -340,7 +340,7 @@ in { documize = handleTest ./documize.nix {}; documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; doh-proxy-rust = handleTest ./doh-proxy-rust.nix {}; - dokuwiki = handleTest ./dokuwiki.nix {}; + dokuwiki = runTest ./dokuwiki.nix; dolibarr = handleTest ./dolibarr.nix {}; domination = handleTest ./domination.nix {}; dovecot = handleTest ./dovecot.nix {}; diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 6f7ee60fc193..ebbefd0dcfaf 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -1,6 +1,8 @@ -import ./make-test-python.nix ({ pkgs, ... }: +{ config, ... }: let + pkgs = config.node.pkgs; + template-bootstrap3 = pkgs.stdenv.mkDerivation rec { name = "bootstrap3"; version = "2022-07-27"; @@ -163,4 +165,4 @@ in { "curl -sSfL http://site1.local/rewrite-test | grep 'Hello, NixOS!'", ) ''; -}) +}