From 36afc858ef1147d5b099f56f6a7e1f0a4abd884a Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 29 Apr 2018 15:40:48 +0200 Subject: core/tests: Fix predictable-interface-names tests Those also have subtests and they also test different variations of options, so let's actually create a check for every single variations. Signed-off-by: aszlig --- modules/core/tests.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/core/tests.nix b/modules/core/tests.nix index bd44bf3b..1aca3f30 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -457,8 +457,21 @@ let { check = config.services.powerdns.enable; path = ["nixos" "powerdns"]; } - { check = config.networking.usePredictableInterfaceNames; - path = ["nixos" "predictable-interface-names"]; + { check = config.networking.usePredictableInterfaceNames + && !config.networking.useNetworkd; + path = ["nixos" "predictable-interface-names" "predictable"]; + } + { check = config.networking.usePredictableInterfaceNames + && config.networking.useNetworkd; + path = ["nixos" "predictable-interface-names" "predictableNetworkd"]; + } + { check = !config.networking.usePredictableInterfaceNames + && !config.networking.useNetworkd; + path = ["nixos" "predictable-interface-names" "unpredictable"]; + } + { check = !config.networking.usePredictableInterfaceNames + && config.networking.useNetworkd; + path = ["nixos" "predictable-interface-names" "unpredictableNetworkd"]; } { check = config.services.printing.enable; path = ["nixos" "printing"]; -- cgit 1.4.1