technofab/nixtest
1
0
Fork 0
mirror of https://gitlab.com/TECHNOFAB/nixtest.git synced 2026-02-02 03:15:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: clean up module a bit

Browse source
This commit is contained in:
technofab 2025-07-30 21:53:53 +02:00
parent 0272a8b0dc
commit b2fb77ecc9
Signed by: technofab
SSH key fingerprint: SHA256:bV4h88OqS/AxjbPn66uUdvK9JsgIW4tv3vwJQ8tpMqQ
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/module.nix
View file

@ -3,7 +3,17 @@
lib, lib,
... ...
}: let }: let
inherit (lib) mkOptionType mkOption types; inherit
(lib)
mkOptionType
mkOption
types
filterAttrs
isType
removePrefix
assertMsg
generators
;
nixtest-lib = import ./default.nix {inherit pkgs lib;}; nixtest-lib = import ./default.nix {inherit pkgs lib;};
@ -16,14 +26,14 @@
unset = { unset = {
_type = "unset"; _type = "unset";
}; };
isUnset = lib.isType "unset"; isUnset = isType "unset";
filterUnset = value: filterUnset = value:
if builtins.isAttrs value && !builtins.hasAttr "_type" value if builtins.isAttrs value && !builtins.hasAttr "_type" value
then let then let
filteredAttrs = builtins.mapAttrs (n: v: filterUnset v) value; filteredAttrs = builtins.mapAttrs (n: v: filterUnset v) value;
in in
lib.filterAttrs (name: value: (!isUnset value)) filteredAttrs filterAttrs (name: value: (!isUnset value)) filteredAttrs
else if builtins.isList value else if builtins.isList value
then builtins.filter (elem: !isUnset elem) (map filterUnset value) then builtins.filter (elem: !isUnset elem) (map filterUnset value)
else value; else value;
@ -42,18 +52,18 @@
if isUnset val if isUnset val
then val then val
else let else let
fileRelative = lib.removePrefix testsBase val.file; fileRelative = removePrefix testsBase val.file;
in "${fileRelative}:${toString val.line}"; in "${fileRelative}:${toString val.line}";
}; };
type = mkOption { type = mkOption {
type = types.enum ["unit" "snapshot" "script"]; type = types.enum ["unit" "snapshot" "script"];
default = "unit"; default = "unit";
apply = value: apply = value:
assert lib.assertMsg (value != "script" || !isUnset config.script) assert assertMsg (value != "script" || !isUnset config.script)
"test '${config.name}' as type 'script' requires 'script' to be set"; "test '${config.name}' as type 'script' requires 'script' to be set";
assert lib.assertMsg (value != "unit" || !isUnset config.expected) assert assertMsg (value != "unit" || !isUnset config.expected)
"test '${config.name}' as type 'unit' requires 'expected' to be set"; "test '${config.name}' as type 'unit' requires 'expected' to be set";
assert lib.assertMsg ( assert assertMsg (
let let
actualIsUnset = isUnset config.actual; actualIsUnset = isUnset config.actual;
actualDrvIsUnset = isUnset config.actualDrv; actualDrvIsUnset = isUnset config.actualDrv;
@ -81,7 +91,7 @@
apply = val: apply = val:
if isUnset val || config.format == "json" if isUnset val || config.format == "json"
then val then val
else lib.generators.toPretty {} val; else generators.toPretty {} val;
}; };
actual = mkOption { actual = mkOption {
type = types.anything; type = types.anything;
@ -89,7 +99,7 @@
apply = val: apply = val:
if isUnset val || config.format == "json" if isUnset val || config.format == "json"
then val then val
else lib.generators.toPretty {} val; else generators.toPretty {} val;
}; };
actualDrv = mkOption { actualDrv = mkOption {
type = types.either types.package unsetType; type = types.either types.package unsetType;