about summary refs log tree commit diff
path: root/modules/core
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-29 15:40:48 +0200
committeraszlig <aszlig@nix.build>2018-04-29 15:40:48 +0200
commit36afc858ef1147d5b099f56f6a7e1f0a4abd884a (patch)
tree17d032a2283bd70ce96eb670c11bbcac739e68d5 /modules/core
parent3ac7016abec65524d8aedcb930bd549523ac257b (diff)
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 <aszlig@nix.build>
Diffstat (limited to 'modules/core')
-rw-r--r--modules/core/tests.nix17
1 files changed, 15 insertions, 2 deletions
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"];