diff options
| -rw-r--r-- | talpid_ipc/src/client.rs | 20 | ||||
| -rw-r--r-- | talpid_ipc/tests/ipc-client-server.rs | 5 |
2 files changed, 3 insertions, 22 deletions
diff --git a/talpid_ipc/src/client.rs b/talpid_ipc/src/client.rs index 56f4f5c121..5d63db24f9 100644 --- a/talpid_ipc/src/client.rs +++ b/talpid_ipc/src/client.rs @@ -121,23 +121,3 @@ impl WsIpcClient { id } } - - -#[cfg(test)] -mod tests { - extern crate env_logger; - use super::*; - - // TODO(linus): This is not a test. Just an ugly way to quickly test the client implementation - #[test] - #[ignore] - fn ws_ipc_client_tester() { - env_logger::init().unwrap(); - - let mut ws = WsIpcClient::new("ws://127.0.0.1:INSERT_PORT".to_owned()).unwrap(); - let event = serde_json::Value::String("Up".to_owned()); - let env = serde_json::Value::Object(serde_json::Map::new()); - let params = serde_json::Value::Array(vec![event, env]); - println!("CALL RESULT: {:?}", ws.call("openvpn_event", ¶ms)); - } -} diff --git a/talpid_ipc/tests/ipc-client-server.rs b/talpid_ipc/tests/ipc-client-server.rs index a41bce282a..654eff4dcc 100644 --- a/talpid_ipc/tests/ipc-client-server.rs +++ b/talpid_ipc/tests/ipc-client-server.rs @@ -36,7 +36,7 @@ fn ipc_client_server() { let server_id = server.address().to_owned(); let mut client = create_client(server_id); - client.call("foo", &[97]).unwrap(); + let _result: () = client.call("foo", &[97]).unwrap(); assert_eq!(Ok(97), rx.recv_timeout(Duration::from_millis(500))); } @@ -49,7 +49,8 @@ fn ipc_client_invalid_url() { #[test] fn ipc_client_invalid_method() { let mut client = create_client("ws://127.0.0.1:9876".to_owned()); - assert_matches!(client.call("invalid_method", &[0]), Err(_)); + let result: Result<(), _> = client.call("invalid_method", &[0]); + assert_matches!(result, Err(_)); } fn create_server() -> (talpid_ipc::IpcServer, mpsc::Receiver<i64>) { |