summary refs log tree commit diff
path: root/lib/tests/modules
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-11-30 22:38:56 +0100
committerSilvan Mosberger <contact@infinisil.com>2020-12-17 21:52:24 +0100
commit767d80099cd8418b3cc7338eb24f9217fedb6449 (patch)
treedc6af45088e2c6f2e5fefa63034f7077f350ad6f /lib/tests/modules
parent991dfccbd1935aabb76a20245ca0108aadd38f3c (diff)
downloadnixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.tar
nixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.tar.gz
nixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.tar.bz2
nixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.tar.lz
nixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.tar.xz
nixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.tar.zst
nixpkgs-767d80099cd8418b3cc7338eb24f9217fedb6449.zip
lib/modules: Introduce _module.checks.*.check
Previously the .enable option was used to encode the condition as well,
which lead to some oddness:
- In order to encode an assertion, one had to invert it
- To disable a check, one had to mkForce it

By introducing a separate .check option this is solved because:
- It can be used to encode assertions
- Disabling is done separately with .enable option, whose default can be
  overridden without a mkForce
Diffstat (limited to 'lib/tests/modules')
-rw-r--r--lib/tests/modules/assertions/condition-true.nix8
-rw-r--r--lib/tests/modules/assertions/enable-false.nix1
-rw-r--r--lib/tests/modules/assertions/multi.nix8
-rw-r--r--lib/tests/modules/assertions/simple.nix2
-rw-r--r--lib/tests/modules/assertions/submodule-attrsOf-attrsOf.nix2
-rw-r--r--lib/tests/modules/assertions/submodule-attrsOf.nix2
-rw-r--r--lib/tests/modules/assertions/submodule.nix2
-rw-r--r--lib/tests/modules/assertions/underscore-attributes.nix2
-rw-r--r--lib/tests/modules/assertions/warning.nix2
9 files changed, 19 insertions, 10 deletions
diff --git a/lib/tests/modules/assertions/condition-true.nix b/lib/tests/modules/assertions/condition-true.nix
new file mode 100644
index 00000000000..7ca0817a239
--- /dev/null
+++ b/lib/tests/modules/assertions/condition-true.nix
@@ -0,0 +1,8 @@
+{
+
+  _module.checks.test = {
+    check = true;
+    message = "Assertion failed";
+  };
+
+}
diff --git a/lib/tests/modules/assertions/enable-false.nix b/lib/tests/modules/assertions/enable-false.nix
index c326c086f03..11f753bb32e 100644
--- a/lib/tests/modules/assertions/enable-false.nix
+++ b/lib/tests/modules/assertions/enable-false.nix
@@ -2,6 +2,7 @@
 
   _module.checks.test = {
     enable = false;
+    check = false;
     message = "Assertion failed";
   };
 
diff --git a/lib/tests/modules/assertions/multi.nix b/lib/tests/modules/assertions/multi.nix
index ebbe17f3a55..1e2e14b8643 100644
--- a/lib/tests/modules/assertions/multi.nix
+++ b/lib/tests/modules/assertions/multi.nix
@@ -2,20 +2,20 @@
 
   _module.checks = {
     test1 = {
-      enable = true;
+      check = false;
       message = "Assertion 1 failed";
     };
     test2 = {
-      enable = true;
+      check = false;
       message = "Assertion 2 failed";
     };
     test3 = {
-      enable = true;
+      check = false;
       message = "Warning 3 failed";
       type = "warning";
     };
     test4 = {
-      enable = true;
+      check = false;
       message = "Warning 4 failed";
       type = "warning";
     };
diff --git a/lib/tests/modules/assertions/simple.nix b/lib/tests/modules/assertions/simple.nix
index a63b8090f91..115d89a3036 100644
--- a/lib/tests/modules/assertions/simple.nix
+++ b/lib/tests/modules/assertions/simple.nix
@@ -1,6 +1,6 @@
 {
   _module.checks.test = {
-    enable = true;
+    check = false;
     message = "Assertion failed";
   };
 }
diff --git a/lib/tests/modules/assertions/submodule-attrsOf-attrsOf.nix b/lib/tests/modules/assertions/submodule-attrsOf-attrsOf.nix
index a5f92aa93c7..27a63d1e432 100644
--- a/lib/tests/modules/assertions/submodule-attrsOf-attrsOf.nix
+++ b/lib/tests/modules/assertions/submodule-attrsOf-attrsOf.nix
@@ -4,7 +4,7 @@
     default = { bar.baz = {}; };
     type = lib.types.attrsOf (lib.types.attrsOf (lib.types.submodule {
       _module.checks.test = {
-        enable = true;
+        check = false;
         message = "Assertion failed";
       };
     }));
diff --git a/lib/tests/modules/assertions/submodule-attrsOf.nix b/lib/tests/modules/assertions/submodule-attrsOf.nix
index 450cad0804d..aac5937cf7e 100644
--- a/lib/tests/modules/assertions/submodule-attrsOf.nix
+++ b/lib/tests/modules/assertions/submodule-attrsOf.nix
@@ -4,7 +4,7 @@
     default = { bar = {}; };
     type = lib.types.attrsOf (lib.types.submodule {
       _module.checks.test = {
-        enable = true;
+        check = false;
         message = "Assertion failed";
       };
     });
diff --git a/lib/tests/modules/assertions/submodule.nix b/lib/tests/modules/assertions/submodule.nix
index a46734a326b..4e7e0b1bd61 100644
--- a/lib/tests/modules/assertions/submodule.nix
+++ b/lib/tests/modules/assertions/submodule.nix
@@ -4,7 +4,7 @@
     default = {};
     type = lib.types.submodule {
       _module.checks.test = {
-        enable = true;
+        check = false;
         message = "Assertion failed";
       };
     };
diff --git a/lib/tests/modules/assertions/underscore-attributes.nix b/lib/tests/modules/assertions/underscore-attributes.nix
index c28c9dcd918..f9ee5c5787b 100644
--- a/lib/tests/modules/assertions/underscore-attributes.nix
+++ b/lib/tests/modules/assertions/underscore-attributes.nix
@@ -1,7 +1,7 @@
 {
 
   _module.checks._test = {
-    enable = true;
+    check = false;
     message = "Assertion failed";
   };
 
diff --git a/lib/tests/modules/assertions/warning.nix b/lib/tests/modules/assertions/warning.nix
index 8fed9871aa2..72598ba3fdd 100644
--- a/lib/tests/modules/assertions/warning.nix
+++ b/lib/tests/modules/assertions/warning.nix
@@ -1,7 +1,7 @@
 {
 
   _module.checks.test = {
-    enable = true;
+    check = false;
     type = "warning";
     message = "Warning message";
   };