From 2b6058709aaaccda04dc17532966f8fd814fbc33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Oct 2026 00:06:12 +0000 Subject: [PATCH 1/2] chore(deps): bump termlens from 0.11.2 to 0.11.4 Bumps [termlens](https://github.com/vyncint/termlens) from 0.11.2 to 0.11.4. - [Release notes](https://github.com/vyncint/termlens/releases) - [Changelog](https://github.com/vyncint/termlens/blob/main/CHANGELOG.md) - [Commits](https://github.com/vyncint/termlens/compare/v0.11.2...v0.11.4) --- updated-dependencies: - dependency-name: termlens dependency-version: 0.11.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e54cf53..80a3a4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1466,9 +1466,9 @@ dependencies = [ [[package]] name = "termlens" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f87d209970e479a096785b98dc9f482934a5c74256a878385d1de18cb8ada20" +checksum = "a6a01f95c453a05e278ea908c3e19cab25d716bce21347515d8ef965e93ba941" dependencies = [ "libc", "portable-pty", From e8aa161f5701fa8c62984e4d280b3cecf25f6946 Mon Sep 17 00:00:00 2001 From: Vyncint Ng <115854244+vyncint@users.noreply.github.com> Date: Mon, 5 Oct 2026 07:07:00 +0700 Subject: [PATCH 2/2] test: inspect's trailer and styled output under termlens 0.11.3 and later `inspect_reproduces_the_checked_in_shell_golden` failed twice over on the termlens bump, both from changes the 0.11.3 changelog lists. The trailer. The wait now ends when the program exits or its output has been silent for --idle (#374), so a shell that goes quiet is reported `still running (killed on exit)` and only one still printing at --timeout says `at the deadline`. The test asserted the second form. It asserts the shared prefix now, which is what it means: the shell did not exit. The golden. Piped, inspect writes a saved screen with its `styles:` block (#454, #478), where the checked-in goldens are the grid alone, so the diff against shell-80x24.txt exited 1. The block is dropped with grid_of, the helper the other golden checks already use; against 0.11.2 there is no block and it is the whole screen. Both edits hold on 0.11.2 and later. Checked against the published termlens-cli 0.11.4, the version this lockfile now pins: the five CLI tests pass, and with only the trailer edit the diff step fails as described. Signed-off-by: Vyncint Ng <115854244+vyncint@users.noreply.github.com> --- crates/reconverge-tui/tests/cli.rs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/crates/reconverge-tui/tests/cli.rs b/crates/reconverge-tui/tests/cli.rs index e74fb73..46141d4 100644 --- a/crates/reconverge-tui/tests/cli.rs +++ b/crates/reconverge-tui/tests/cli.rs @@ -218,13 +218,17 @@ fn inspect_reproduces_the_checked_in_shell_golden() { ); let printed = stdout(&out); assert!(printed.starts_with("size: 80x24"), "{printed}"); - // The shell is a TUI, so inspect reports the deadline rather than an + // The shell is a TUI, so inspect reports it still running rather than an // exit — on **stderr** since termlens 0.11 (termlens#340), so that what // stdout carries is a saved screen and needs no filtering here. Against // 0.10.x the trailer followed the screen on stdout and this test dropped - // the line itself. + // the line itself. Which "still running" it is depends on what ended the + // wait: since termlens 0.11.3 (#374) a shell that goes quiet for `--idle` + // reads `still running (killed on exit)`, and only one that keeps + // printing until `--timeout` says `at the deadline`. Both mean it did not + // exit, which is all this asserts. assert!( - String::from_utf8_lossy(&out.stderr).contains("still running at the deadline"), + String::from_utf8_lossy(&out.stderr).contains("still running"), "the shell does not exit on its own: {}", String::from_utf8_lossy(&out.stderr) ); @@ -232,7 +236,13 @@ fn inspect_reproduces_the_checked_in_shell_golden() { !printed.contains("--- "), "stdout is the screen alone:\n{printed}" ); - let screen = printed.clone(); + // Through a pipe, inspect writes a saved screen *with* its `styles:` + // block since termlens 0.11.3 (#454, #478), where the checked-in goldens + // are the grid alone. The grid is what the two paths into a screen have + // to agree on here, so the block is dropped the way the other golden + // checks drop it (`grid_of`); against 0.11.2 there is none and this is + // the whole screen. + let screen = format!("{}\n", grid_of(&printed)); let live = env::temp_dir().join(format!("reconverge-inspect-{}.snap", std::process::id())); fs::write(&live, &screen).expect("write the inspected screen");