Skip to content

Commit 519ec7b

Browse files
committed
Use subTests
1 parent bb170ef commit 519ec7b

1 file changed

Lines changed: 71 additions & 64 deletions

File tree

‎Lib/test/test_pyrepl/test_pyrepl.py‎

Lines changed: 71 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
force_not_colorized,
2424
make_clean_env,
2525
Py_DEBUG,
26+
subTests,
2627
)
2728
from test.support import has_subprocess_support, SHORT_TIMEOUT, STDLIB_DIR
2829
from test.support.import_helper import import_module
@@ -1986,8 +1987,9 @@ def test_bracketed_paste_single_line(self):
19861987
output = multiline_input(reader)
19871988
self.assertEqual(output, input_code)
19881989

1989-
def test_bracketed_paste_repl_session(self):
1990-
cases = [
1990+
@subTests(
1991+
("source", "expected"),
1992+
[
19911993
(">>> 1 + 1", "1 + 1"),
19921994
(
19931995
"""\
@@ -2060,33 +2062,35 @@ def double(value):
20602062
'text = "\v\f\x85\u2028\u2029"\n',
20612063
),
20622064
(">>>", ""),
2063-
]
2064-
for source, expected in cases:
2065-
source = textwrap.dedent(source)
2066-
expected = textwrap.dedent(expected)
2067-
for newline in ("\n", "\r\n", "\r"):
2068-
with self.subTest(source=source, newline=newline):
2069-
events = code_to_events(
2070-
"\x1b[200~" + source.replace("\n", newline)
2071-
+ "\x1b[201~"
2072-
)
2073-
reader, _ = handle_all_events(
2074-
events,
2075-
prepare_console=FakeConsole,
2076-
prepare_reader=partial(
2077-
ReadlineAlikeReader,
2078-
config=ReadlineConfig(readline_completer=None),
2079-
more_lines=more_lines,
2080-
),
2081-
)
2082-
self.assertEqual(
2083-
reader.get_unicode(), expected.replace("\n", newline)
2084-
)
2085-
self.assertEqual(reader.pos, len(reader.buffer))
2086-
self.assertFalse(reader.finished)
2087-
2088-
def test_bracketed_paste_preserves_non_session(self):
2089-
for source in (
2065+
],
2066+
)
2067+
def test_bracketed_paste_repl_session(self, source, expected):
2068+
source = textwrap.dedent(source)
2069+
expected = textwrap.dedent(expected)
2070+
for name, newline in (("LF", "\n"), ("CRLF", "\r\n"), ("CR", "\r")):
2071+
with self.subTest(newline=name):
2072+
events = code_to_events(
2073+
"\x1b[200~" + source.replace("\n", newline)
2074+
+ "\x1b[201~"
2075+
)
2076+
reader, _ = handle_all_events(
2077+
events,
2078+
prepare_console=FakeConsole,
2079+
prepare_reader=partial(
2080+
ReadlineAlikeReader,
2081+
config=ReadlineConfig(readline_completer=None),
2082+
more_lines=more_lines,
2083+
),
2084+
)
2085+
self.assertEqual(
2086+
reader.get_unicode(), expected.replace("\n", newline)
2087+
)
2088+
self.assertEqual(reader.pos, len(reader.buffer))
2089+
self.assertFalse(reader.finished)
2090+
2091+
@subTests(
2092+
"source",
2093+
(
20902094
"print('hello')\n",
20912095
"...",
20922096
"... value\n",
@@ -2098,45 +2102,48 @@ def test_bracketed_paste_preserves_non_session(self):
20982102
... example
20992103
"""
21002104
'''),
2101-
):
2102-
with self.subTest(source=source):
2103-
events = code_to_events(
2104-
"\x1b[200~" + source + "\x1b[201~"
2105-
)
2106-
reader, _ = handle_all_events(
2107-
events, prepare_console=FakeConsole
2108-
)
2109-
self.assertEqual(reader.get_unicode(), source)
2110-
2111-
def test_bracketed_paste_preserves_session_in_nonempty_buffer(self):
2105+
),
2106+
)
2107+
def test_bracketed_paste_preserves_non_session(self, source):
2108+
events = code_to_events("\x1b[200~" + source + "\x1b[201~")
2109+
reader, _ = handle_all_events(events, prepare_console=FakeConsole)
2110+
self.assertEqual(reader.get_unicode(), source)
2111+
2112+
@subTests(
2113+
("initial", "pos"),
2114+
(
2115+
(initial, pos)
2116+
for initial in (" ", "value = ", 'text = """\n')
2117+
for pos in (0, len(initial))
2118+
),
2119+
)
2120+
def test_bracketed_paste_preserves_session_in_nonempty_buffer(
2121+
self, initial, pos
2122+
):
21122123
source = textwrap.dedent("""\
21132124
>>> print('hello')
21142125
hello
21152126
""")
2116-
for initial in (" ", "value = ", 'text = """\n'):
2117-
for pos in (0, len(initial)):
2118-
with self.subTest(initial=initial, pos=pos):
2119-
def prepare_reader(console):
2120-
reader = ReadlineAlikeReader(
2121-
console,
2122-
config=ReadlineConfig(readline_completer=None),
2123-
more_lines=more_lines,
2124-
)
2125-
reader.insert(initial)
2126-
reader.pos = pos
2127-
return reader
2128-
2129-
events = code_to_events(
2130-
"\x1b[200~" + source + "\x1b[201~"
2131-
)
2132-
reader, _ = handle_all_events(
2133-
events,
2134-
prepare_console=FakeConsole,
2135-
prepare_reader=prepare_reader,
2136-
)
2137-
self.assertEqual(
2138-
reader.get_unicode(), initial[:pos] + source + initial[pos:]
2139-
)
2127+
2128+
def prepare_reader(console):
2129+
reader = ReadlineAlikeReader(
2130+
console,
2131+
config=ReadlineConfig(readline_completer=None),
2132+
more_lines=more_lines,
2133+
)
2134+
reader.insert(initial)
2135+
reader.pos = pos
2136+
return reader
2137+
2138+
events = code_to_events("\x1b[200~" + source + "\x1b[201~")
2139+
reader, _ = handle_all_events(
2140+
events,
2141+
prepare_console=FakeConsole,
2142+
prepare_reader=prepare_reader,
2143+
)
2144+
self.assertEqual(
2145+
reader.get_unicode(), initial[:pos] + source + initial[pos:]
2146+
)
21402147

21412148
def test_bracketed_paste_preserves_prompts_in_input(self):
21422149
source = ">>> not a REPL session"

0 commit comments

Comments
 (0)