test(client): replace deprecated Sender.completer with send

This commit is contained in:
wangcong
2017-03-15 01:11:22 +08:00
committed by Sean McArthur
parent 5a3743c1ba
commit 34509ef51a

View File

@@ -81,7 +81,7 @@ macro_rules! test {
assert_eq!(s(&buf[..n]), expected, "expected is invalid"); assert_eq!(s(&buf[..n]), expected, "expected is invalid");
inc.write_all($server_reply.as_ref()).unwrap(); 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"))); let rx = rx.map_err(|_| hyper::Error::Io(io::Error::new(io::ErrorKind::Other, "thread panicked")));
@@ -242,13 +242,13 @@ fn client_keep_alive() {
let mut buf = [0; 4096]; let mut buf = [0; 4096];
sock.read(&mut buf).expect("read 1"); 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"); 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"); sock.read(&mut buf).expect("read 2");
let second_get = b"GET /b HTTP/1.1\r\n"; let second_get = b"GET /b HTTP/1.1\r\n";
assert_eq!(&buf[..second_get.len()], second_get); 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"); 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(());
}); });
@@ -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); 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"); sock.write_all(out.as_bytes()).expect("write 1");
drop(sock); drop(sock);
tx1.complete(()); tx1.send(());
let mut sock = server.accept().unwrap().0; let mut sock = server.accept().unwrap().0;
sock.read(&mut buf).expect("read 2"); sock.read(&mut buf).expect("read 2");
@@ -294,7 +294,7 @@ fn client_pooled_socket_disconnected() {
let remote_addr = sock.peer_addr().unwrap().to_string(); 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); 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"); sock.write_all(out.as_bytes()).expect("write 2");
tx2.complete(()); tx2.send(());
}); });
// spin shortly so we receive the hangup on the client socket // spin shortly so we receive the hangup on the client socket