Skip to content

stty: don't depend on the system stty in test_saved_state_valid_formats #15346

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

Closed
ozenyunus35 wants to merge 6 commits into from
Closed

stty: don't depend on the system stty in test_saved_state_valid_formats #15346

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd2c246
stty: don't depend on the system stty in test_saved_state_valid_formats
ozenyunus35 Oct 14, 2026
18e7324
stty: change a setting before restoring the saved state in the test
ozenyunus35 Oct 14, 2026
071099e
stty: compare only the flag fields after restoring the saved state
ozenyunus35 Oct 15, 2026
41f705b
fixup! stty: reduce unsafe using rustix
xtqqczze Oct 15, 2026
4c94a7c
Merge remote-tracking branch 'origin/main' into stty-test-no-system-stty
ozenyunus35 Oct 15, 2026
858b1d1
Merge commit '41f705b9d' into stty-test-no-system-stty
ozenyunus35 Oct 15, 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
17 changes: 14 additions & 3 deletions tests/by-util/test_stty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,13 +866,24 @@ fn test_saved_state_valid_formats() {
let (path, _controller, _replica) = pty_path();
let (_at, ts) = at_and_ts!();

// Generate valid saved state from the actual terminal
let saved = unwrap_or_return!(expected_result(&ts, &["-g", "--file", &path])).stdout_move_str();
// Generate valid saved state from the actual terminal with our own stty,
// so the test doesn't depend on the system stty
let saved = ts
.ucmd()
.args(&["-g", "--file", &path])
.succeeds()
.stdout_move_str();
let saved = saved.trim();

let result = ts.ucmd().args(&["--file", &path, saved]).run();

result.success().no_stderr();
result.success().no_output();

// Restoring the state leaves the terminal as it was

@sylvestre sylvestre Oct 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this restores the state that is already set, so it can't really catch much. could you change a setting first, then restore and compare?

@ozenyunus35 ozenyunus35 Oct 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good point. It now sets -echo first, checks the saved state changed, then restores and compares.

ts.ucmd()
.args(&["-g", "--file", &path])
.succeeds()
.stdout_only(format!("{saved}\n"));

let exp_result = unwrap_or_return!(expected_result(&ts, &["--file", &path, saved]));
let normalized_stderr = normalize_stderr(result.stderr_str());
Expand Down
Loading