diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2018-11-06 11:16:28 +0100 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2018-11-06 11:48:42 +0100 |
| commit | 7992519be5d59a69dc71f43ec2f34c5594afdb14 (patch) | |
| tree | 04b7448bc49a63a3d86703edf9a34e1f4dbe22a5 /testsuite.py | |
| parent | 9c9f0c884366ff1f0acc00e430f0eeb1b4391658 (diff) | |
Always strip trailing whitespace in 'MenuNode.help' and __str__()
Previously, you could get either one or two newlines at the end of
MenuNode.help and the various __str__() methods, though this wasn't
documented.
Always stripping trailing whitespace is cleaner e.g. when using print(),
which automatically appends a trailing newline, and makes things
consistent.
Hopefully nothing relied on the old undocumented behavior. It's fine for
genrest.py at least.
Diffstat (limited to 'testsuite.py')
| -rw-r--r-- | testsuite.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/testsuite.py b/testsuite.py index 6f05b6a..65ce4aa 100644 --- a/testsuite.py +++ b/testsuite.py @@ -489,10 +489,11 @@ def run_selftests(): print("Testing Symbol.__str__()/custom_str() and def_{int,hex,string}") def verify_str(item, s): - verify_equal(str(item), s[1:]) + verify_equal(str(item), s[1:-1]) def verify_custom_str(item, s): - verify_equal(item.custom_str(lambda sc: "[{}]".format(sc.name)), s[1:]) + verify_equal(item.custom_str(lambda sc: "[{}]".format(sc.name)), + s[1:-1]) c = Kconfig("Kconfiglib/tests/Kstr", warn=False) @@ -936,7 +937,7 @@ comment "advanced comment" c = Kconfig("Kconfiglib/tests/Khelp") def verify_help(node, s): - verify_equal(node.help, s[1:]) + verify_equal(node.help, s[1:-1]) verify_help(c.syms["TWO_HELP_STRINGS"].nodes[0], """ first help string @@ -2553,13 +2554,11 @@ config BOOL prompt "foo" if DEF || !UNDEF_1 default UNDEF_2 - - Referenced at Kconfiglib/tests/Kundef:19: menu "menu" depends on UNDEF_1 visible if UNDEF_3 - warning: undefined symbol UNDEF_2: - Referenced at Kconfiglib/tests/Kundef:4: @@ -2569,7 +2568,6 @@ config BOOL prompt "foo" if DEF || !UNDEF_1 default UNDEF_2 - - Referenced at Kconfiglib/tests/Kundef:8: config INT @@ -2577,7 +2575,6 @@ config INT range UNDEF_2 8 range 5 15 default 10 - warning: undefined symbol UNDEF_3: - Referenced at Kconfiglib/tests/Kundef:19: @@ -2585,7 +2582,7 @@ warning: undefined symbol UNDEF_3: menu "menu" depends on UNDEF_1 visible if UNDEF_3 -"""[1:]) +"""[1:-1]) os.environ.pop("KCONFIG_WARN_UNDEF") |