about summary refs log tree commit diff
path: root/lib/tests
diff options
context:
space:
mode:
authorJacob Abel <jacobabel@nullpo.dev>2022-07-09 20:12:31 -0400
committerJacob Abel <jacobabel@nullpo.dev>2022-10-23 17:50:24 -0400
commited71173841618bd4c69f40d07fb467ccabc5db0b (patch)
tree4532a1f7bc9459c07badc3e91e80bf5260d8832f /lib/tests
parent88b18dcf445a1be963a6bd2f9e8c075edd668f71 (diff)
lib/strings: Update docs and restructured code to improve readability of toInt and toIntBase10.
Diffstat (limited to 'lib/tests')
-rw-r--r--lib/tests/misc.nix4
-rwxr-xr-xlib/tests/modules.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 4bfc8bb876994..31c938a8ffda1 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -346,6 +346,8 @@ runTests {
     ( builtins.tryEval (toInt "123 123") == { success = false; value = false; } )
     ( builtins.tryEval (toInt "0 123") == { success = false; value = false; } )
     ( builtins.tryEval (toInt " 0d ") == { success = false; value = false; } )
+    ( builtins.tryEval (toInt " 1d ") == { success = false; value = false; } )
+    ( builtins.tryEval (toInt " d0 ") == { success = false; value = false; } )
     ( builtins.tryEval (toInt "00") == { success = false; value = false; } )
     ( builtins.tryEval (toInt "01") == { success = false; value = false; } )
     ( builtins.tryEval (toInt "002") == { success = false; value = false; } )
@@ -388,6 +390,8 @@ runTests {
     ( builtins.tryEval (toIntBase10 "123 123") == { success = false; value = false; } )
     ( builtins.tryEval (toIntBase10 "0 123") == { success = false; value = false; } )
     ( builtins.tryEval (toIntBase10 " 0d ") == { success = false; value = false; } )
+    ( builtins.tryEval (toIntBase10 " 1d ") == { success = false; value = false; } )
+    ( builtins.tryEval (toIntBase10 " d0 ") == { success = false; value = false; } )
     ( builtins.tryEval (toIntBase10 " foo ") == { success = false; value = false; } )
     ( builtins.tryEval (toIntBase10 " foo 123 ") == { success = false; value = false; } )
     ( builtins.tryEval (toIntBase10 " foo 00123 ") == { success = false; value = false; } )
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 92c28369ed5cd..c9ea674ee104a 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -162,7 +162,7 @@ checkConfigError 'A definition for option .* is not.*string or signed integer co
 # Check coerced value with unsound coercion
 checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
 checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
-checkConfigError 'Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
+checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
 # Check mkAliasOptionModule.
 checkConfigOutput '^true$' config.enable ./alias-with-priority.nix