30da5d0a89
many tests patched sys.platform or a module's _IS_WINDOWS flag, then ran on linux ci. the patch selects the branch under test, but the host does not have the behavior the branch exists for. the test proves the patch, not the platform. some gated assertions never ran on any host. this commit adds three markers: linux_only, macos_only, windows_only. a conftest hook skips a marked test on the other hosts, with a clear reason. no test fakes a host now. two documented fakes remain (android/termux, freebsd) because no ci runner exists for them. each fake site got one of four treatments: - gate it: the real host supplies the platform; mocks cover real dependencies only, never host identity - patch the module's own probe when the subject is the probe's consumer - assert against the real host when the fake stood in for any non-x host - delete the patch when it set the value the host already has bare skipif(sys.platform != ...) guards became markers too. the lane model skips these on linux and never imports them on windows, so they ran on no host. platform parametrize tables are now one marked test per os. running on real hosts found real errors: a chrome-sandbox failure in test_gui_command that main hides, and two windows failures fixed here. the agents.md testing section now documents the policy.
83 lines
3.1 KiB
Python
83 lines
3.1 KiB
Python
"""Regression tests for issue #22379 — Ctrl+Enter newline over SSH/WSL.
|
|
|
|
prompt_toolkit treats c-j (LF) as Enter on POSIX so thin PTYs (docker exec,
|
|
some BSD ssh) that send LF for plain Enter still work. But Windows Terminal
|
|
(native, WSL, and SSH-forwarded sessions) sends Ctrl+Enter as bare LF — same
|
|
byte. Without environment-aware gating, binding c-j to submit means
|
|
Ctrl+Enter submits instead of inserting a newline.
|
|
|
|
These tests pin the gating predicate and the resulting binding behavior.
|
|
|
|
``_preserve_ctrl_enter_newline()`` short-circuits to True on native Windows
|
|
before it ever looks at the environment, so the env-driven cases below are
|
|
POSIX assertions and run on the Linux job. The native-Windows short-circuit
|
|
is marked ``windows_only`` and asserted on the real host — patching
|
|
``sys.platform`` to ``"win32"`` here would only re-assert the literal in the
|
|
``if``, on an interpreter where none of the Windows terminal behaviour it
|
|
exists for is present.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.mark.windows_only
|
|
def test_native_windows_preserves_newline():
|
|
import cli as cli_mod
|
|
|
|
assert cli_mod._preserve_ctrl_enter_newline() is True
|
|
|
|
|
|
def test_ssh_tty_alone_preserves_newline():
|
|
import cli as cli_mod
|
|
# Strip out anything that might leak truth
|
|
with patch.dict(os.environ, {"SSH_TTY": "/dev/pts/0"}, clear=True):
|
|
assert cli_mod._preserve_ctrl_enter_newline() is True
|
|
|
|
|
|
def test_windows_terminal_session_preserves_newline():
|
|
import cli as cli_mod
|
|
with patch.dict(os.environ, {"WT_SESSION": "abc-def"}, clear=True):
|
|
assert cli_mod._preserve_ctrl_enter_newline() is True
|
|
|
|
|
|
def test_ghostty_tmux_session_preserves_ctrl_j_newline():
|
|
"""Ghostty-inherited env survives tmux even when TERM_PROGRAM becomes tmux."""
|
|
import cli as cli_mod
|
|
with patch.dict(
|
|
os.environ,
|
|
{"TERM": "tmux-256color", "TERM_PROGRAM": "tmux", "GHOSTTY_RESOURCES_DIR": "/usr/share/ghostty"},
|
|
clear=True,
|
|
):
|
|
assert cli_mod._preserve_ctrl_enter_newline() is True
|
|
|
|
|
|
@pytest.mark.linux_only
|
|
def test_proc_version_microsoft_marker_preserves_newline():
|
|
"""WSL detection via /proc when env vars are scrubbed (sudo etc.).
|
|
|
|
``linux_only``: the fallback reads ``/proc/version`` — a Linux-only
|
|
interface, and the WSL kernels it sniffs for are Linux kernels.
|
|
"""
|
|
import cli as cli_mod
|
|
from io import StringIO
|
|
with patch.dict(os.environ, {}, clear=True):
|
|
real_open = open
|
|
|
|
def _fake_open(path, *args, **kwargs):
|
|
if "/proc/version" in str(path) or "/proc/sys/kernel/osrelease" in str(path):
|
|
return StringIO("Linux version 5.15.167.4-microsoft-standard-WSL2")
|
|
return real_open(path, *args, **kwargs)
|
|
|
|
with patch("builtins.open", side_effect=_fake_open):
|
|
assert cli_mod._preserve_ctrl_enter_newline() is True
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# install_ctrl_enter_alias() — ANSI sequence mappings for enhanced terminals
|
|
# ---------------------------------------------------------------------------
|