aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOgulcan Celik <ogulcancelik@gmail.com>2026-05-24 21:21:58 +0300
committerOgulcan Celik <ogulcancelik@gmail.com>2026-05-24 21:30:04 +0300
commit420925d141c8805e610eb0d62d49d8b9b483d961 (patch)
treebbd1f778a038bf4387c704a0df921fa53e7af615 /tests
parent43c6ca3a5dbdcefc6c6dc29be9ce81d990baf39e (diff)
fix: support scrolling direct agent attaches
Diffstat (limited to 'tests')
-rw-r--r--tests/api_ping.rs2
-rw-r--r--tests/cli_wrapper.rs12
-rw-r--r--tests/client_mode.rs36
-rw-r--r--tests/cross_area.rs16
-rw-r--r--tests/detach_reattach.rs44
-rw-r--r--tests/multi_client.rs2
-rw-r--r--tests/server_headless.rs14
7 files changed, 63 insertions, 63 deletions
diff --git a/tests/api_ping.rs b/tests/api_ping.rs
index b1468ae4..a124fb4a 100644
--- a/tests/api_ping.rs
+++ b/tests/api_ping.rs
@@ -227,7 +227,7 @@ fn ping_over_socket_returns_version() {
assert_eq!(value["result"]["version"], env!("CARGO_PKG_VERSION"));
// Intentionally hardcoded so wire protocol bumps require updating this test.
// Changing this value means old clients/servers are no longer compatible.
- assert_eq!(value["result"]["protocol"], 10);
+ assert_eq!(value["result"]["protocol"], 11);
cleanup_spawned_herdr(child, base);
}
diff --git a/tests/cli_wrapper.rs b/tests/cli_wrapper.rs
index f9084f6a..4a281c79 100644
--- a/tests/cli_wrapper.rs
+++ b/tests/cli_wrapper.rs
@@ -1109,7 +1109,7 @@ fn status_commands_report_client_and_server_versions() {
"stdout: {full_stdout}"
);
assert!(
- full_stdout.contains(" protocol: 10"),
+ full_stdout.contains(" protocol: 11"),
"stdout: {full_stdout}"
);
assert!(full_stdout.contains("server:\n"), "stdout: {full_stdout}");
@@ -1142,7 +1142,7 @@ fn status_commands_report_client_and_server_versions() {
"stdout: {server_stdout}"
);
assert!(
- server_stdout.contains("protocol: 10"),
+ server_stdout.contains("protocol: 11"),
"stdout: {server_stdout}"
);
@@ -1154,7 +1154,7 @@ fn status_commands_report_client_and_server_versions() {
"stdout: {client_stdout}"
);
assert!(
- client_stdout.contains("protocol: 10"),
+ client_stdout.contains("protocol: 11"),
"stdout: {client_stdout}"
);
assert!(
@@ -1164,7 +1164,7 @@ fn status_commands_report_client_and_server_versions() {
let full_json = run_cli_json(&socket_path, &["status", "--json"]);
assert_eq!(full_json["client"]["version"], env!("CARGO_PKG_VERSION"));
- assert_eq!(full_json["client"]["protocol"], 10);
+ assert_eq!(full_json["client"]["protocol"], 11);
assert_eq!(full_json["server"]["status"], "running");
assert_eq!(full_json["server"]["running"], true);
assert_eq!(full_json["server"]["compatible"], true);
@@ -1178,12 +1178,12 @@ fn status_commands_report_client_and_server_versions() {
let server_json = run_cli_json(&socket_path, &["status", "server", "--json"]);
assert_eq!(server_json["status"], "running");
assert_eq!(server_json["version"], env!("CARGO_PKG_VERSION"));
- assert_eq!(server_json["protocol"], 10);
+ assert_eq!(server_json["protocol"], 11);
assert_eq!(server_json["compatible"], true);
let client_json = run_cli_json(&socket_path, &["status", "client", "--json"]);
assert_eq!(client_json["version"], env!("CARGO_PKG_VERSION"));
- assert_eq!(client_json["protocol"], 10);
+ assert_eq!(client_json["protocol"], 11);
assert!(client_json["binary"]
.as_str()
.is_some_and(|path| !path.is_empty()));
diff --git a/tests/client_mode.rs b/tests/client_mode.rs
index 6e3e52cd..b7504aca 100644
--- a/tests/client_mode.rs
+++ b/tests/client_mode.rs
@@ -274,8 +274,8 @@ fn client_connects_and_receives_frame() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10, "server should report protocol version 10");
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11, "server should report protocol version 11");
assert!(
error.is_none(),
"handshake should not have error: {:?}",
@@ -342,8 +342,8 @@ fn client_sees_headless_startup_config_diagnostic() {
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
stream
@@ -391,8 +391,8 @@ fn client_input_forwarded_to_pane() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Send an Input message containing "echo hello\n".
@@ -445,8 +445,8 @@ fn client_resize_sends_message() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain the initial frame(s).
@@ -504,8 +504,8 @@ fn server_shutdown_sends_message_to_client() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Send SIGINT so the server takes the graceful shutdown path and
@@ -736,8 +736,8 @@ fn client_receives_frame_after_pane_output() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
read_next_frame_payload(&mut stream, Duration::from_secs(10))
@@ -783,8 +783,8 @@ fn navigate_mode_keybind_dispatch_in_server() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frames.
@@ -901,8 +901,8 @@ fn graceful_shutdown_sends_server_shutdown_to_client() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frame(s).
@@ -1000,8 +1000,8 @@ fn client_receives_notify_on_agent_state_change() {
// Connect as a client and perform handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frame(s).
diff --git a/tests/cross_area.rs b/tests/cross_area.rs
index 37adda43..008358d0 100644
--- a/tests/cross_area.rs
+++ b/tests/cross_area.rs
@@ -686,7 +686,7 @@ fn cross_area_detach_and_reattach_preserves_state() {
// Local attach (client A).
let mut client_a = UnixStream::connect(&client_socket).expect("client A should connect");
- client_handshake(&mut client_a, 10, 100, 30);
+ client_handshake(&mut client_a, 11, 100, 30);
assert!(wait_for_frame(&mut client_a, Duration::from_secs(2)));
// Use herdr: create a workspace and write output into its pane.
@@ -723,7 +723,7 @@ fn cross_area_detach_and_reattach_preserves_state() {
// Reattach from another terminal/session (client B).
let mut client_b = UnixStream::connect(&client_socket).expect("client B should connect");
- client_handshake(&mut client_b, 10, 80, 24);
+ client_handshake(&mut client_b, 11, 80, 24);
assert!(
wait_for_frame(&mut client_b, Duration::from_secs(5)),
"reattached client should receive frame"
@@ -779,7 +779,7 @@ fn cross_area_agent_process_survives_detach_and_reattach() {
wait_for_socket(&client_socket, Duration::from_secs(10));
let mut client_a = UnixStream::connect(&client_socket).expect("client A should connect");
- client_handshake(&mut client_a, 10, 100, 30);
+ client_handshake(&mut client_a, 11, 100, 30);
assert!(wait_for_frame(&mut client_a, Duration::from_secs(2)));
let created = workspace_create(&api_socket, "agent-persist");
@@ -832,7 +832,7 @@ fn cross_area_agent_process_survives_detach_and_reattach() {
// Reattach and ensure client-side state reflects the persisted working status.
let mut client_b = UnixStream::connect(&client_socket).expect("client B should connect");
- client_handshake(&mut client_b, 10, 80, 24);
+ client_handshake(&mut client_b, 11, 80, 24);
let saw_working_on_client =
wait_for_frame_matching(&mut client_b, Duration::from_secs(5), |frame| {
frame_contains_text(frame, "working")
@@ -877,7 +877,7 @@ fn cross_area_client_and_api_workspace_views_are_consistent() {
wait_for_socket(&client_socket, Duration::from_secs(10));
let mut client = UnixStream::connect(&client_socket).expect("client should connect");
- client_handshake(&mut client, 10, 100, 30);
+ client_handshake(&mut client, 11, 100, 30);
assert!(wait_for_frame(&mut client, Duration::from_secs(2)));
drain_server_messages(&mut client, Duration::from_millis(300));
@@ -940,9 +940,9 @@ fn cross_area_two_clients_shared_view_and_single_detach_stability() {
wait_for_socket(&client_socket, Duration::from_secs(10));
let mut client_a = UnixStream::connect(&client_socket).expect("client A should connect");
- client_handshake(&mut client_a, 10, 110, 30);
+ client_handshake(&mut client_a, 11, 110, 30);
let mut client_b = UnixStream::connect(&client_socket).expect("client B should connect");
- client_handshake(&mut client_b, 10, 100, 30);
+ client_handshake(&mut client_b, 11, 100, 30);
assert!(wait_for_frame(&mut client_a, Duration::from_secs(2)));
assert!(wait_for_frame(&mut client_b, Duration::from_secs(2)));
@@ -1111,7 +1111,7 @@ fn cross_area_server_kill_then_restart_and_reconnect() {
let mut reconnect_client =
UnixStream::connect(&client_socket).expect("new client should connect after restart");
- client_handshake(&mut reconnect_client, 10, 80, 24);
+ client_handshake(&mut reconnect_client, 11, 80, 24);
assert!(
wait_for_frame(&mut reconnect_client, Duration::from_secs(5)),
"new client should receive frame after restart"
diff --git a/tests/detach_reattach.rs b/tests/detach_reattach.rs
index d486fb82..1e90d94b 100644
--- a/tests/detach_reattach.rs
+++ b/tests/detach_reattach.rs
@@ -276,8 +276,8 @@ fn navigate_q_detaches_client_and_server_persists() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frames.
@@ -338,8 +338,8 @@ fn explicit_detach_message_causes_clean_disconnect() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frames.
@@ -397,8 +397,8 @@ fn reattach_after_detach_shows_current_state() {
// --- Client A ---
let mut stream_a = UnixStream::connect(&client_socket).expect("client A should connect");
let (version, error) =
- client_handshake(&mut stream_a, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream_a, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frames.
@@ -436,8 +436,8 @@ fn reattach_after_detach_shows_current_state() {
// --- Client B (reattach) ---
let mut stream_b = UnixStream::connect(&client_socket).expect("client B should connect");
let (version, error) =
- client_handshake(&mut stream_b, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream_b, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(
error.is_none(),
"reattach handshake should succeed: {:?}",
@@ -516,8 +516,8 @@ fn processes_survive_during_and_after_detach() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frames.
@@ -555,8 +555,8 @@ fn processes_survive_during_and_after_detach() {
// Reattach — verify we can connect and receive a frame.
let mut stream_b = UnixStream::connect(&client_socket).expect("should reattach");
let (version, error) =
- client_handshake(&mut stream_b, 10, 80, 24).expect("reattach handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream_b, 11, 80, 24).expect("reattach handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Verify the reattached client receives a frame.
@@ -604,8 +604,8 @@ fn server_persists_after_client_connection_drop() {
// Connect and handshake.
let mut stream = UnixStream::connect(&client_socket).expect("should connect");
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Drain initial frames.
@@ -631,8 +631,8 @@ fn server_persists_after_client_connection_drop() {
// Reattach — verify we can connect and handshake again.
let mut stream_b = UnixStream::connect(&client_socket).expect("should reattach");
let (version, error) =
- client_handshake(&mut stream_b, 10, 80, 24).expect("reattach handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream_b, 11, 80, 24).expect("reattach handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "reattach should succeed: {:?}", error);
cleanup_spawned_herdr(spawned, base);
@@ -653,8 +653,8 @@ fn detached_output_preserves_last_attached_pty_size() {
let mut stream = UnixStream::connect(&client_socket).expect("client should connect");
let (version, error) =
- client_handshake(&mut stream, 10, 120, 40).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream, 11, 120, 40).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
drain_messages(&mut stream);
@@ -722,8 +722,8 @@ fn output_accumulated_while_detached_visible_on_reattach() {
// Connect and handshake client A.
let mut stream_a = UnixStream::connect(&client_socket).expect("client A should connect");
let (version, error) =
- client_handshake(&mut stream_a, 10, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream_a, 11, 80, 24).expect("handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Detach client A immediately.
@@ -780,8 +780,8 @@ fn output_accumulated_while_detached_visible_on_reattach() {
// --- Client B (reattach) ---
let mut stream_b = UnixStream::connect(&client_socket).expect("client B should connect");
let (version, error) =
- client_handshake(&mut stream_b, 10, 80, 24).expect("reattach handshake should succeed");
- assert_eq!(version, 10);
+ client_handshake(&mut stream_b, 11, 80, 24).expect("reattach handshake should succeed");
+ assert_eq!(version, 11);
assert!(error.is_none(), "{:?}", error);
// Client B should receive a frame with the current state.
diff --git a/tests/multi_client.rs b/tests/multi_client.rs
index cf507c44..ca525e69 100644
--- a/tests/multi_client.rs
+++ b/tests/multi_client.rs
@@ -550,7 +550,7 @@ fn client_handshake(
fn connect_raw_client(client_socket: &Path, cols: u16, rows: u16) -> UnixStream {
let mut stream = UnixStream::connect(client_socket).expect("should connect to client socket");
- client_handshake(&mut stream, 10, cols, rows).expect("handshake should succeed");
+ client_handshake(&mut stream, 11, cols, rows).expect("handshake should succeed");
stream
}
diff --git a/tests/server_headless.rs b/tests/server_headless.rs
index a81d8302..332398e0 100644
--- a/tests/server_headless.rs
+++ b/tests/server_headless.rs
@@ -594,9 +594,9 @@ fn client_handshake_succeeds() {
// Send Hello with the current protocol version, 80 cols, 24 rows.
let (version, error) =
- client_handshake(&mut stream, 10, 80, 24).expect("handshake should succeed");
+ client_handshake(&mut stream, 11, 80, 24).expect("handshake should succeed");
- assert_eq!(version, 10, "server should report protocol version 10");
+ assert_eq!(version, 11, "server should report protocol version 11");
assert!(
error.is_none(),
"handshake should not have an error: {:?}",
@@ -625,7 +625,7 @@ fn client_handshake_rejects_incompatible_version() {
let (version, error) = client_handshake(&mut stream, 0, 80, 24)
.expect("should read Welcome response even on rejection");
- assert_eq!(version, 10, "server should report its version 10");
+ assert_eq!(version, 11, "server should report its version 11");
assert!(
error.is_some(),
"version 0 should be rejected with an error"
@@ -650,10 +650,10 @@ fn client_handshake_clamps_small_terminal_size() {
// Send Hello with 0x0 terminal size — should be clamped.
let mut stream = UnixStream::connect(&client_socket).expect("should connect to client socket");
- let (version, error) = client_handshake(&mut stream, 10, 0, 0)
+ let (version, error) = client_handshake(&mut stream, 11, 0, 0)
.expect("handshake with 0x0 should succeed (server clamps)");
- assert_eq!(version, 10);
+ assert_eq!(version, 11);
assert!(
error.is_none(),
"0x0 size should be accepted (clamped): {:?}",
@@ -713,9 +713,9 @@ fn no_hello_client_closed_within_five_seconds() {
// Verify the server is still healthy — a proper client can still connect.
let mut good_stream =
UnixStream::connect(&client_socket).expect("should connect after no-hello client");
- let (version, error) = client_handshake(&mut good_stream, 10, 80, 24)
+ let (version, error) = client_handshake(&mut good_stream, 11, 80, 24)
.expect("proper handshake should still work after no-hello client");
- assert_eq!(version, 10);
+ assert_eq!(version, 11);
assert!(error.is_none());
// API should still work.