diff options
author | Silvan Mosberger <contact@infinisil.com> | 2020-09-17 18:08:44 +0200 |
---|---|---|
committer | Silvan Mosberger <contact@infinisil.com> | 2020-09-17 18:20:35 +0200 |
commit | d0be9e98109428e67e4b7fab3e49728cc6633073 (patch) | |
tree | b0f9f263e84ccf3f105e4edce0ad865f79f939de /lib/tests | |
parent | 073e9b2aed0f855ce26bd3a26dab044c0c17c817 (diff) |
lib/generators.toPretty: Switch away from δ and λ
- These symbols can be confusing for those not familiar with them
- There's no harm in making these more obvious
- Terminals may not print them correctly either
Also changes the function argument printing slightly to be more obvious
Diffstat (limited to 'lib/tests')
-rw-r--r-- | lib/tests/misc.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 813a8e7f815f..2456b52c099c 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -445,7 +445,10 @@ runTests { expected = builtins.toJSON val; }; - testToPretty = { + testToPretty = + let + deriv = derivation { name = "test"; builder = "/bin/sh"; system = builtins.currentSystem; }; + in { expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec { int = 42; float = 0.1337; @@ -459,7 +462,7 @@ runTests { functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; attrs = { foo = null; "foo bar" = "baz"; }; - drv = derivation { name = "test"; system = builtins.currentSystem; }; + drv = deriv; }; expected = rec { int = "42"; @@ -470,11 +473,11 @@ runTests { newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; - function = "<λ>"; - functionArgs = "<λ:{(arg),foo}>"; + function = "<function>"; + functionArgs = "<function, args: {arg?, foo}>"; list = "[ 3 4 ${function} [ false ] ]"; attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ:test>"; + drv = "<derivation ${deriv.drvPath}>"; }; }; |