Skip to content

Commit

Permalink
gh-121973: Fix flaky test_pyrepl tests (GH-122140)
Browse files Browse the repository at this point in the history
This fixes the flakiness in:
* test_inspect_keeps_globals_from_inspected_file
* test_inspect_keeps_globals_from_inspected_module

The output already includes newlines. Adding newlines for every entry in
the output list introduces non-determinism because it added '\n' in
places where stdout is flushed or some buffer becomes full.

The regex also needed to be updated because pyrepl includes control
characters -- the visible output on each line doesn't immediately follow
a newline character.

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
  • Loading branch information
colesbury and ambv authored Jul 23, 2024
1 parent 624bda7 commit 2c1b1e7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Lib/test/test_pyrepl/test_pyrepl.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ def _run_repl_globals_test(self, expectations, *, as_file=False, as_module=False
mod = blue / "calx.py"
mod.write_text("FOO = 42", encoding="utf-8")
commands = [
"print(f'{" + var + "=}')" for var in expectations
"print(f'^{" + var + "=}')" for var in expectations
] + ["exit()"]
if as_file and as_module:
self.fail("as_file and as_module are mutually exclusive")
Expand All @@ -989,10 +989,10 @@ def _run_repl_globals_test(self, expectations, *, as_file=False, as_module=False
self.assertEqual(exit_code, 0)
for var, expected in expectations.items():
with self.subTest(var=var, expected=expected):
if m := re.search(rf"[\r\n]{var}=(.+?)[\r\n]", output):
if m := re.search(rf"\^{var}=(.+?)[\r\n]", output):
self._assertMatchOK(var, expected, actual=m.group(1))
else:
self.fail(f"{var}= not found in output")
self.fail(f"{var}= not found in output: {output!r}\n\n{output}")

self.assertNotIn("Exception", output)
self.assertNotIn("Traceback", output)
Expand Down Expand Up @@ -1126,4 +1126,4 @@ def run_repl(
except subprocess.TimeoutExpired:
process.kill()
exit_code = process.wait()
return "\n".join(output), exit_code
return "".join(output), exit_code

0 comments on commit 2c1b1e7

Please sign in to comment.