mirror of https://github.com/linkerd/linkerd2.git
proxy: fix flaky tcp graceful shutdown test (#735)
This commit is contained in:
parent
02c6887020
commit
7f54b5253d
|
@ -131,9 +131,17 @@ fn tcp_waits_for_proxies_to_close() {
|
||||||
let msg2 = "custom tcp bye";
|
let msg2 = "custom tcp bye";
|
||||||
|
|
||||||
let srv = server::tcp()
|
let srv = server::tcp()
|
||||||
.accept(move |read| {
|
// Trigger a shutdown while TCP stream is busy
|
||||||
assert_eq!(read, msg1.as_bytes());
|
.accept_fut(move |sock| {
|
||||||
msg2
|
shdn.signal();
|
||||||
|
tokio_io::io::read(sock, vec![0; 256])
|
||||||
|
.and_then(move |(sock, vec, n)| {
|
||||||
|
assert_eq!(&vec[..n], msg1.as_bytes());
|
||||||
|
|
||||||
|
tokio_io::io::write_all(sock, msg2.as_bytes())
|
||||||
|
})
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|e| panic!("tcp server error: {}", e))
|
||||||
})
|
})
|
||||||
.run();
|
.run();
|
||||||
let ctrl = controller::new().run();
|
let ctrl = controller::new().run();
|
||||||
|
@ -147,8 +155,6 @@ fn tcp_waits_for_proxies_to_close() {
|
||||||
|
|
||||||
let tcp_client = client.connect();
|
let tcp_client = client.connect();
|
||||||
|
|
||||||
shdn.signal();
|
|
||||||
|
|
||||||
tcp_client.write(msg1);
|
tcp_client.write(msg1);
|
||||||
assert_eq!(tcp_client.read(), msg2.as_bytes());
|
assert_eq!(tcp_client.read(), msg2.as_bytes());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue