diff options
Diffstat (limited to 'tests/client_mode.rs')
| -rw-r--r-- | tests/client_mode.rs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/client_mode.rs b/tests/client_mode.rs index 4f628faa..c1b62394 100644 --- a/tests/client_mode.rs +++ b/tests/client_mode.rs @@ -16,7 +16,7 @@ use serde_json::Value; use support::{ cleanup_test_base, client_handshake, encode_varint_u32, frame_message, read_server_message, register_runtime_dir, register_spawned_herdr_pid, unregister_spawned_herdr_pid, - wait_for_message_variant, wait_for_socket, wait_until, + wait_for_message_variant, wait_for_socket, wait_until, CURRENT_PROTOCOL, }; fn unique_test_dir() -> PathBuf { @@ -311,8 +311,11 @@ 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, 14, 80, 24).expect("handshake should succeed"); - assert_eq!(version, 14, "server should report protocol version 14"); + client_handshake(&mut stream, CURRENT_PROTOCOL, 80, 24).expect("handshake should succeed"); + assert_eq!( + version, CURRENT_PROTOCOL, + "server should report current protocol version" + ); assert!( error.is_none(), "handshake should not have error: {:?}", @@ -379,8 +382,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, 14, 80, 24).expect("handshake should succeed"); - assert_eq!(version, 14); + client_handshake(&mut stream, CURRENT_PROTOCOL, 80, 24).expect("handshake should succeed"); + assert_eq!(version, CURRENT_PROTOCOL); assert!(error.is_none(), "{:?}", error); stream @@ -595,8 +598,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, 14, 80, 24).expect("handshake should succeed"); - assert_eq!(version, 14); + client_handshake(&mut stream, CURRENT_PROTOCOL, 80, 24).expect("handshake should succeed"); + assert_eq!(version, CURRENT_PROTOCOL); assert!(error.is_none(), "{:?}", error); read_next_frame_payload(&mut stream, Duration::from_secs(10)) @@ -710,8 +713,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, 14, 80, 24).expect("handshake should succeed"); - assert_eq!(version, 14); + client_handshake(&mut stream, CURRENT_PROTOCOL, 80, 24).expect("handshake should succeed"); + assert_eq!(version, CURRENT_PROTOCOL); assert!(error.is_none(), "{:?}", error); // Drain initial frame(s). @@ -809,8 +812,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, 14, 80, 24).expect("handshake should succeed"); - assert_eq!(version, 14); + client_handshake(&mut stream, CURRENT_PROTOCOL, 80, 24).expect("handshake should succeed"); + assert_eq!(version, CURRENT_PROTOCOL); assert!(error.is_none(), "{:?}", error); // Drain initial frame(s). |