Skip to content

gh-143394: filter for turning off automatic margins in test_no_newline #143433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambv merged 2 commits into from
Jan 5, 2026
Merged

gh-143394: filter for turning off automatic margins in test_no_newline #143433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d164877
filter for turning off automatic margins in test_no_newline
chris-eibl Jan 5, 2026
5017cc2
add smam
chris-eibl Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Lib/test/test_pyrepl/test_pyrepl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1899,6 +1899,17 @@ def test_no_newline(self):
safe_patterns.append(r'\x1b\[\?25[hl]') # cursor visibility
safe_patterns.append(r'\x1b\[\?12[hl]') # cursor blinking

# rmam / smam - automatic margins
rmam = ti.get("rmam")
Copy link
Member Author

@chris-eibl chris-eibl Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've taken rmam from https://man7.org/linux/man-pages/man5/terminfo.5.html.

@ambv Should I add

       enter_am_mode               smam      SA     turn on automatic margins

as well?

Copy link
Contributor

@ambv ambv Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please.

Chris, this didn't fail because the terminfo database can be different between computers depending on where you got it. I've seen IDEs override it, too, to work around issues with their custom built-in terminal emulators. Finally, while (almost) nobody does that, technically the terminfo database is user-editable and even allows addition of custom user-defined capabilities. So we'll likely have to do some whackamole with stuff we missed for a time, but that's alright. I had the same worry with replacing ncurses with a hand-rolled terminfo parser, but so far, so good. The only report we got so far there was from NetBSD.

Copy link
Contributor

@smontanaro smontanaro Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, my setup is a stock MacOS Tahoe (26.2) running on an M1 MacBook Pro. I don't do framework builds. Tests are run in a normal MacOS Terminal app with TERM defined as xterm256color. While I refer to TERM in my various shell startup files, I do not change its value, nor do I see a file in /etc containing TERM.

Are the Mac buildbots testing framework builds? If so, what kind of terminal environment exists there? Perhaps the pyrepl tests should be run a few times with different (common?) values for TERM.

Copy link
Member Author

@chris-eibl chris-eibl Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chris, this didn't fail because the terminfo database can be different between computers depending on [...]

Thank you for the detailed explanation ❤️

Copy link
Member Author

@chris-eibl chris-eibl Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yet, I do not understand why e.g. CI passed previous to this PR. We didn't do any filtering regarding \033[?7h before, but CI passed. I assume, because in CI and for our build bots is_apple_terminal is false, but obviously on @smontanaro's setup it returns true.

Setting is_apple_terminal manually to true immediately raised the problem for me on WSL and native Ubuntu ...

Copy link
Contributor

@ambv ambv Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the culprit, @chris-eibl: the Apple Terminal special case. I'll make sure to test that, too, when landing stuff. We can also look into running the main test_pyrepl stuff twice, the second time with is_apple_terminal mocked to return True. That way we won't regress in the future.

Copy link
Contributor

@smontanaro smontanaro Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As someone who uses a Mac daily, are there changes to my environment I can make to mimic the environment of the Mac buildbots? I'm happy to add that to my mix. I routinely run tests for main and the two most recent older branches (currently 3.13 & 3.14).

Copy link
Member Author

@chris-eibl chris-eibl Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most probably is_apple_terminal is false on CI, because os.getenv("TERM_PROGRAM") == "Apple_Terminal" does not evaluate to true there, but idk why :(

At least #143461 takes care to enforce Apple_Terminal, so your use case is now handled, too.

You can set TERM_PROGRAM to something different than Apple_Terminal to mimic what happened in CI.

Copy link
Contributor

@smontanaro smontanaro Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can set TERM_PROGRAM to something different than Apple_Terminal to mimic what happened in CI.

Excellent, I can just run in an xterm. (Hadn't occurred to me before, but then I didn't realize there were these kinds of environment diffs.)

smam = ti.get("smam")
if rmam:
safe_patterns.append(re.escape(rmam.decode("ascii")))
if smam:
safe_patterns.append(re.escape(smam.decode("ascii")))
if not rmam and not smam:
safe_patterns.append(r'\x1b\[\?7l') # turn off automatic margins
safe_patterns.append(r'\x1b\[\?7h') # turn on automatic margins

# Modern extensions not in standard terminfo - always use patterns
safe_patterns.append(r'\x1b\[\?2004[hl]') # bracketed paste mode
safe_patterns.append(r'\x1b\[\?12[hl]') # cursor blinking (may be separate)
Expand Down
Loading