From e932e98437ea9184365233bad439860c795f65a1 Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Mon, 27 Mar 2023 17:06:12 +0200 Subject: lib.toPlist: keep test output in external files for their tab indents --- .editorconfig | 4 +++ lib/tests/misc.nix | 47 +--------------------------------- lib/tests/test-to-plist-expected.plist | 46 +++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 46 deletions(-) create mode 100644 lib/tests/test-to-plist-expected.plist diff --git a/.editorconfig b/.editorconfig index c9711d519408a..ebb66b07945c1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -101,3 +101,7 @@ end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset charset = unset + +[lib/tests/*.plist] +indent_style = tab +insert_final_newline = unset diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d7173bbf3a3d2..2cb8596703fc5 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -936,52 +936,7 @@ runTests { }; }; }; - expected = { value = '' - - - - nested - - values - - attrs - - foo b/ar - baz - - bool - - emptyattrs - - - - emptylist - - - - emptystring - - float - 0.133700 - int - 42 - list - - 3 - 4 - test - - newlinestring - - - path - /foo - string - fn''${o}"r\d - - - -''; }; + expected = { value = builtins.readFile ./test-to-plist-expected.plist; }; }; # CLI diff --git a/lib/tests/test-to-plist-expected.plist b/lib/tests/test-to-plist-expected.plist new file mode 100644 index 0000000000000..df0528a60767b --- /dev/null +++ b/lib/tests/test-to-plist-expected.plist @@ -0,0 +1,46 @@ + + + + + nested + + values + + attrs + + foo b/ar + baz + + bool + + emptyattrs + + + + emptylist + + + + emptystring + + float + 0.133700 + int + 42 + list + + 3 + 4 + test + + newlinestring + + + path + /foo + string + fn${o}"r\d + + + + \ No newline at end of file -- cgit 1.4.1