From bc4203d221c87a0622d089aaa61884f86d40fd44 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 3 Jun 2020 19:09:09 +0200 Subject: core/tests: Add missing wireguard attr suffixes Commit 89c3cda819da5dc32e4a29ff8f2aad118bde64c7 changed the wireguard attributes to use nested attributes because it was changed upstream. However what the commit has missed is that the attributes are not just plain attributes but come with a kernel version suffix, for example like this: tests.wireguard.wireguard-basic-linux-5_4 tests.wireguard.wireguard-basic-linux-latest tests.wireguard.wireguard-generated-linux-5_4 tests.wireguard.wireguard-generated-linux-latest tests.wireguard.wireguard-namespaces-linux-5_4 tests.wireguard.wireguard-namespaces-linux-latest tests.wireguard.wireguard-wg-quick-linux-5_4 tests.wireguard.wireguard-wg-quick-linux-latest Adding the "-linux-${version}" suffix should fix evaluation. Signed-off-by: aszlig --- modules/core/tests.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/core/tests.nix b/modules/core/tests.nix index 26a04477..ed016983 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -3,6 +3,10 @@ let inherit (lib) any elem; + isLatestKernel = config.boot.kernelPackages.kernel.version + == pkgs.linuxPackages_latest.kernel.version; + wgTestSuffix = "linux-${if isLatestKernel then "latest" else "5_4"}"; + whichNet = if config.networking.useNetworkd then "networkd" else "scripted"; mkTest = attrs: if attrs.check then attrs.paths or [ attrs.path ] else []; @@ -1060,21 +1064,21 @@ let path = ["nixos" "virtualbox" "headless"]; } { check = config.networking.wireguard.enable; - path = ["nixos" "wireguard" "basic"]; + path = ["nixos" "wireguard" "basic-${wgTestSuffix}"]; } { check = with config.networking.wireguard; enable && anyAttrs (i: i.generatePrivateKeyFile) interfaces; - path = ["nixos" "wireguard" "generated"]; + path = ["nixos" "wireguard" "generated-${wgTestSuffix}"]; } { check = let isEnabled = config.networking.wireguard.enable; usesNS = iface: iface.socketNamespace != null || iface.interfaceNamespace != null; in isEnabled && anyAttrs usesNS config.networking.wireguard.interfaces; - path = ["nixos" "wireguard" "namespaces"]; + path = ["nixos" "wireguard" "namespaces-${wgTestSuffix}"]; } { check = config.networking.wg-quick.interfaces != {}; - path = ["nixos" "wireguard" "wg-quick"]; + path = ["nixos" "wireguard" "wg-quick-${wgTestSuffix}"]; } { check = config.services.wordpress != {}; path = ["nixos" "wordpress"]; -- cgit 1.4.1