Skip to content

Commit

Permalink
test(client): replace deprecated Sender.completer with send
Browse files Browse the repository at this point in the history
  • Loading branch information
king6cong authored and seanmonstar committed Mar 14, 2017
1 parent 5a3743c commit 34509ef
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ macro_rules! test {
assert_eq!(s(&buf[..n]), expected, "expected is invalid");

inc.write_all($server_reply.as_ref()).unwrap();
tx.complete(());
let _ = tx.send(());
});

let rx = rx.map_err(|_| hyper::Error::Io(io::Error::new(io::ErrorKind::Other, "thread panicked")));
Expand Down Expand Up @@ -242,13 +242,13 @@ fn client_keep_alive() {
let mut buf = [0; 4096];
sock.read(&mut buf).expect("read 1");
sock.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n").expect("write 1");
tx1.complete(());
let _ = tx1.send(());

sock.read(&mut buf).expect("read 2");
let second_get = b"GET /b HTTP/1.1\r\n";
assert_eq!(&buf[..second_get.len()], second_get);
sock.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n").expect("write 2");
tx2.complete(());
let _ = tx2.send(());
});


Expand Down Expand Up @@ -285,7 +285,7 @@ fn client_pooled_socket_disconnected() {
let out = format!("HTTP/1.1 200 OK\r\nContent-Length: {}\r\n\r\n{}", remote_addr.len(), remote_addr);
sock.write_all(out.as_bytes()).expect("write 1");
drop(sock);
tx1.complete(());
tx1.send(());
let mut sock = server.accept().unwrap().0;
sock.read(&mut buf).expect("read 2");
Expand All @@ -294,7 +294,7 @@ fn client_pooled_socket_disconnected() {
let remote_addr = sock.peer_addr().unwrap().to_string();
let out = format!("HTTP/1.1 200 OK\r\nContent-Length: {}\r\n\r\n{}", remote_addr.len(), remote_addr);
sock.write_all(out.as_bytes()).expect("write 2");
tx2.complete(());
tx2.send(());
});
// spin shortly so we receive the hangup on the client socket
Expand Down

0 comments on commit 34509ef

Please sign in to comment.