mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-133054: Skip test_pyrepl tests when cannot use pyrepl is reported (#133055)

Browse source 
Co-authored-by: Tomas R. <tomas.roun8@gmail.com>
This commit is contained in:
sobolevn 2025-04-28 19:09:28 +03:00 • committed by GitHub
parent 58567cc18c
commit b739ec5ab7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Lib/test/test_pyrepl/test_pyrepl.py
View file

@ -44,6 +44,7 @@ class ReplTestCase(TestCase):
*, *,
cmdline_args: list[str] | None = None, cmdline_args: list[str] | None = None,
cwd: str | None = None, cwd: str | None = None,
skip: bool = False,
) -> tuple[str, int]: ) -> tuple[str, int]:
temp_dir = None temp_dir = None
if cwd is None: if cwd is None:
@ -51,7 +52,7 @@ class ReplTestCase(TestCase):
cwd = temp_dir.name cwd = temp_dir.name
try: try:
return self._run_repl( return self._run_repl(
repl_input, env=env, cmdline_args=cmdline_args, cwd=cwd repl_input, env=env, cmdline_args=cmdline_args, cwd=cwd, skip=skip,
) )
finally: finally:
if temp_dir is not None: if temp_dir is not None:
@ -64,6 +65,7 @@ class ReplTestCase(TestCase):
env: dict | None, env: dict | None,
cmdline_args: list[str] | None, cmdline_args: list[str] | None,
cwd: str, cwd: str,
skip: bool,
) -> tuple[str, int]: ) -> tuple[str, int]:
assert pty assert pty
master_fd, slave_fd = pty.openpty() master_fd, slave_fd = pty.openpty()
@ -121,7 +123,10 @@ class ReplTestCase(TestCase):
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
process.kill() process.kill()
exit_code = process.wait() exit_code = process.wait()
return "".join(output), exit_code output = "".join(output)
if skip and "can't use pyrepl" in output:
self.skipTest("pyrepl not available")
return output, exit_code
class TestCursorPosition(TestCase): class TestCursorPosition(TestCase):
@ -1282,9 +1287,7 @@ class TestMain(ReplTestCase):
def test_exposed_globals_in_repl(self): def test_exposed_globals_in_repl(self):
pre = "['__builtins__'" pre = "['__builtins__'"
post = "'__loader__', '__name__', '__package__', '__spec__']" post = "'__loader__', '__name__', '__package__', '__spec__']"
output, exit_code = self.run_repl(["sorted(dir())", "exit()"]) output, exit_code = self.run_repl(["sorted(dir())", "exit()"], skip=True)
if "can't use pyrepl" in output:
self.skipTest("pyrepl not available")
self.assertEqual(exit_code, 0) self.assertEqual(exit_code, 0)
# if `__main__` is not a file (impossible with pyrepl) # if `__main__` is not a file (impossible with pyrepl)
@ -1336,6 +1339,7 @@ class TestMain(ReplTestCase):
commands, commands,
cmdline_args=[str(mod)], cmdline_args=[str(mod)],
env=clean_env, env=clean_env,
skip=True,
) )
elif as_module: elif as_module:
output, exit_code = self.run_repl( output, exit_code = self.run_repl(
@ -1343,13 +1347,11 @@ class TestMain(ReplTestCase):
cmdline_args=["-m", "blue.calx"], cmdline_args=["-m", "blue.calx"],
env=clean_env, env=clean_env,
cwd=td, cwd=td,
skip=True,
) )
else: else:
self.fail("Choose one of as_file or as_module") self.fail("Choose one of as_file or as_module")
if "can't use pyrepl" in output:
self.skipTest("pyrepl not available")
self.assertEqual(exit_code, 0) self.assertEqual(exit_code, 0)
for var, expected in expectations.items(): for var, expected in expectations.items():
with self.subTest(var=var, expected=expected): with self.subTest(var=var, expected=expected):
@ -1387,9 +1389,7 @@ class TestMain(ReplTestCase):
"exit()\n") "exit()\n")
env.pop("PYTHON_BASIC_REPL", None) env.pop("PYTHON_BASIC_REPL", None)
output, exit_code = self.run_repl(commands, env=env) output, exit_code = self.run_repl(commands, env=env, skip=True)
if "can\'t use pyrepl" in output:
self.skipTest("pyrepl not available")
self.assertEqual(exit_code, 0) self.assertEqual(exit_code, 0)
self.assertIn("True", output) self.assertIn("True", output)
self.assertNotIn("False", output) self.assertNotIn("False", output)
@ -1456,9 +1456,7 @@ class TestMain(ReplTestCase):
self.assertIn("division by zero", output) self.assertIn("division by zero", output)
self.assertEqual(exitcode, 0) self.assertEqual(exitcode, 0)
env.pop("PYTHON_BASIC_REPL", None) env.pop("PYTHON_BASIC_REPL", None)
output, exit_code = self.run_repl(commands, env=env) output, exit_code = self.run_repl(commands, env=env, skip=True)
if "can\'t use pyrepl" in output:
self.skipTest("pyrepl not available")
check(output, exit_code) check(output, exit_code)
env["PYTHON_BASIC_REPL"] = "1" env["PYTHON_BASIC_REPL"] = "1"
@ -1496,9 +1494,7 @@ class TestMain(ReplTestCase):
def test_correct_filename_in_syntaxerrors(self): def test_correct_filename_in_syntaxerrors(self):
env = os.environ.copy() env = os.environ.copy()
commands = "a b c\nexit()\n" commands = "a b c\nexit()\n"
output, exit_code = self.run_repl(commands, env=env) output, exit_code = self.run_repl(commands, env=env, skip=True)
if "can't use pyrepl" in output:
self.skipTest("pyrepl not available")
self.assertIn("SyntaxError: invalid syntax", output) self.assertIn("SyntaxError: invalid syntax", output)
self.assertIn("<python-input-0>", output) self.assertIn("<python-input-0>", output)
commands = " b\nexit()\n" commands = " b\nexit()\n"
@ -1525,9 +1521,7 @@ class TestMain(ReplTestCase):
env.pop("PYTHON_BASIC_REPL", None) env.pop("PYTHON_BASIC_REPL", None)
with self.subTest(set_tracebacklimit=set_tracebacklimit, with self.subTest(set_tracebacklimit=set_tracebacklimit,
basic_repl=basic_repl): basic_repl=basic_repl):
output, exit_code = self.run_repl(commands, env=env) output, exit_code = self.run_repl(commands, env=env, skip=True)
if "can't use pyrepl" in output:
self.skipTest("pyrepl not available")
self.assertIn("in x1", output) self.assertIn("in x1", output)
if set_tracebacklimit: if set_tracebacklimit:
self.assertNotIn("in x2", output) self.assertNotIn("in x2", output)
@ -1568,9 +1562,7 @@ class TestMain(ReplTestCase):
def test_history_survive_crash(self): def test_history_survive_crash(self):
env = os.environ.copy() env = os.environ.copy()
commands = "1\nexit()\n" commands = "1\nexit()\n"
output, exit_code = self.run_repl(commands, env=env) output, exit_code = self.run_repl(commands, env=env, skip=True)
if "can't use pyrepl" in output:
self.skipTest("pyrepl not available")
with tempfile.NamedTemporaryFile() as hfile: with tempfile.NamedTemporaryFile() as hfile:
env["PYTHON_HISTORY"] = hfile.name env["PYTHON_HISTORY"] = hfile.name