Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #16182: Merge test_readline from 3.5

This commit is contained in:
Martin Panter 2016-06-14 05:46:17 +00:00
parent 17f0e61891 056f76d978
commit 8e4b7ac7fe
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/test/test_readline.py
View File

@ -15,6 +15,8 @@ from test.support.script_helper import assert_python_ok
# Skip tests if there is no readline module # Skip tests if there is no readline module
readline = import_module('readline') readline = import_module('readline')
is_editline = readline.__doc__ and "libedit" in readline.__doc__
@unittest.skipUnless(hasattr(readline, "clear_history"), @unittest.skipUnless(hasattr(readline, "clear_history"),
"The history update test cannot be run because the " "The history update test cannot be run because the "
"clear_history method is not available.") "clear_history method is not available.")
@ -99,14 +101,17 @@ class TestHistoryManipulation (unittest.TestCase):
self.addCleanup(os.remove, TESTFN) self.addCleanup(os.remove, TESTFN)
readline.clear_history() readline.clear_history()
readline.read_history_file(TESTFN) readline.read_history_file(TESTFN)
if is_editline:
# An add_history() call seems to be required for get_history_
# item() to register items from the file
readline.add_history("dummy")
self.assertEqual(readline.get_history_item(1), "entrée 1") self.assertEqual(readline.get_history_item(1), "entrée 1")
self.assertEqual(readline.get_history_item(2), "entrée 22") self.assertEqual(readline.get_history_item(2), "entrée 22")
class TestReadline(unittest.TestCase): class TestReadline(unittest.TestCase):
@unittest.skipIf(readline._READLINE_VERSION < 0x0600 @unittest.skipIf(readline._READLINE_VERSION < 0x0600 and not is_editline,
and "libedit" not in readline.__doc__,
"not supported in this library version") "not supported in this library version")
def test_init(self): def test_init(self):
# Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not # Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not
@ -142,7 +147,9 @@ print("History length:", readline.get_current_history_length())
if readline.__doc__ and "libedit" in readline.__doc__: if readline.__doc__ and "libedit" in readline.__doc__:
readline.parse_and_bind(r'bind ^B ed-prev-char') readline.parse_and_bind(r'bind ^B ed-prev-char')
readline.parse_and_bind(r'bind "\t" rl_complete') readline.parse_and_bind(r'bind "\t" rl_complete')
readline.parse_and_bind('bind -s ^A "|t\xEB[after]"') # The insert_line() call via pre_input_hook() does nothing with Editline,
# so include the extra text that would have been inserted here
readline.parse_and_bind('bind -s ^A "[\xEFnserted]|t\xEB[after]"')
else: else:
readline.parse_and_bind(r'Control-b: backward-char') readline.parse_and_bind(r'Control-b: backward-char')
readline.parse_and_bind(r'"\t": complete') readline.parse_and_bind(r'"\t": complete')
@ -188,8 +195,9 @@ print("history", ascii(readline.get_history_item(1)))
self.assertIn(b"text 't\\xeb'\r\n", output) self.assertIn(b"text 't\\xeb'\r\n", output)
self.assertIn(b"line '[\\xefnserted]|t\\xeb[after]'\r\n", output) self.assertIn(b"line '[\\xefnserted]|t\\xeb[after]'\r\n", output)
self.assertIn(b"indexes 11 13\r\n", output) self.assertIn(b"indexes 11 13\r\n", output)
self.assertIn(b"substitution 't\\xeb'\r\n", output) if not is_editline: # display() hook not called under Editline
self.assertIn(b"matches ['t\\xebnt', 't\\xebxt']\r\n", output) self.assertIn(b"substitution 't\\xeb'\r\n", output)
self.assertIn(b"matches ['t\\xebnt', 't\\xebxt']\r\n", output)
expected = br"'[\xefnserted]|t\xebxt[after]'" expected = br"'[\xefnserted]|t\xebxt[after]'"
self.assertIn(b"result " + expected + b"\r\n", output) self.assertIn(b"result " + expected + b"\r\n", output)
self.assertIn(b"history " + expected + b"\r\n", output) self.assertIn(b"history " + expected + b"\r\n", output)