Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Drop invasive control sequences from pexpect debug output

Browse source 
A failing test might emit an OSC 133 prompt marking sequence, confusing
the parent terminal to think the test output contains a shell prompt. Let's
remove these.
This commit is contained in:
Johannes Altmanninger 2024-04-09 08:58:43 +02:00
parent adb40149a3
commit 64bc989e19
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build_tools/pexpect_helper.py
View file

@ -29,6 +29,22 @@ TIMEOUT_SECS = 5
UNEXPECTED_SUCCESS = object() UNEXPECTED_SUCCESS = object()
# When rendering fish's output, remove the control sequences that modify terminal state,
# to avoid confusing the calling terminal. No need to replace things like colors and cursor
# movement that are harmless and/or will not leak anyway.
SANITIZE_FOR_PRINTING_RE = re.compile(
r"""
\x1b\[\?1004[hl]
| \x1b\[\?2004[hl]
| \x1b\[>4;[10]m
| \x1b\[>5u
| \x1b\[<1u
| \x1b=
| \x1b>
| \x1b\].*?\x07
""",
re.VERBOSE)
def get_prompt_re(counter): def get_prompt_re(counter):
"""Return a regular expression for matching a with a given prompt counter.""" """Return a regular expression for matching a with a given prompt counter."""
@ -287,7 +303,7 @@ class SpawnedProc(object):
print("") print("")
print("{CYAN}When written to the tty, this looks like:{RESET}".format(**colors)) print("{CYAN}When written to the tty, this looks like:{RESET}".format(**colors))
print("{CYAN}<-------{RESET}".format(**colors)) print("{CYAN}<-------{RESET}".format(**colors))
sys.stdout.write(self.spawn.before) sys.stdout.write(SANITIZE_FOR_PRINTING_RE.sub('', self.spawn.before))
sys.stdout.flush() sys.stdout.flush()
maybe_nl="" maybe_nl=""
if not self.spawn.before.endswith("\n"): if not self.spawn.before.endswith("\n"):