diff options
| author | Victor Stinner <vstinner@python.org> | 2022-01-17 13:00:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 13:00:50 (GMT) |
| commit | ad6e640f910787e73fd00f59117fbd22cdf88c78 (patch) | |
| tree | fe568eaff590e163c67df5ff1d970949fb5e3e51 | |
| parent | 42a64c03ec5c443f2a5c2ee4284622f5d1f5326c (diff) | |
| download | cpython-ad6e640f910787e73fd00f59117fbd22cdf88c78.zip cpython-ad6e640f910787e73fd00f59117fbd22cdf88c78.tar.gz cpython-ad6e640f910787e73fd00f59117fbd22cdf88c78.tar.bz2 | |
bpo-13886: Skip PTY non-ASCII tests if readline is loaded (GH-30631)
Skip test_builtin PTY tests on non-ASCII characters if the readline
module is loaded. The readline module changes input() behavior, but
test_builtin is not intented to test the readline module.
When the readline module is loaded, PyOS_Readline() uses the readline
implementation. In some cases, the Python readline callback
rlhandler() is called by readline with a string without non-ASCII
characters.
| -rw-r--r-- | Lib/test/test_builtin.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2022-01-17-13-10-04.bpo-13886.5mZH4b.rst | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 6dc4fa5..7456803 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -2090,12 +2090,24 @@ class PtyTests(unittest.TestCase): # is different and invokes GNU readline if available). self.check_input_tty("prompt", b"quux") + def skip_if_readline(self): + # bpo-13886: When the readline module is loaded, PyOS_Readline() uses + # the readline implementation. In some cases, the Python readline + # callback rlhandler() is called by readline with a string without + # non-ASCII characters. Skip tests on non-ASCII characters if the + # readline module is loaded, since test_builtin is not intented to test + # the readline module, but the builtins module. + if 'readline' in sys.modules: + self.skipTest("the readline module is loaded") + def test_input_tty_non_ascii(self): - # Check stdin/stdout encoding is used when invoking GNU readline + self.skip_if_readline() + # Check stdin/stdout encoding is used when invoking PyOS_Readline() self.check_input_tty("prompté", b"quux\xe9", "utf-8") def test_input_tty_non_ascii_unicode_errors(self): - # Check stdin/stdout error handler is used when invoking GNU readline + self.skip_if_readline() + # Check stdin/stdout error handler is used when invoking PyOS_Readline() self.check_input_tty("prompté", b"quux\xe9", "ascii") def test_input_no_stdout_fileno(self): diff --git a/Misc/NEWS.d/next/Tests/2022-01-17-13-10-04.bpo-13886.5mZH4b.rst b/Misc/NEWS.d/next/Tests/2022-01-17-13-10-04.bpo-13886.5mZH4b.rst new file mode 100644 index 0000000..cd19dce --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-01-17-13-10-04.bpo-13886.5mZH4b.rst @@ -0,0 +1,3 @@ +Skip test_builtin PTY tests on non-ASCII characters if the readline module +is loaded. The readline module changes input() behavior, but test_builtin is +not intented to test the readline module. Patch by Victor Stinner. |