linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy: fix flaky tcp graceful shutdown test (#735)

This commit is contained in:
Sean McArthur 2018-04-10 19:47:00 -07:00 committed by GitHub
parent 02c6887020
commit 7f54b5253d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proxy/tests/shutdown.rs
View File

@ -131,9 +131,17 @@ fn tcp_waits_for_proxies_to_close() {
let msg2 = "custom tcp bye";
let srv = server::tcp()
.accept(move |read| {
assert_eq!(read, msg1.as_bytes());
msg2
// Trigger a shutdown while TCP stream is busy
.accept_fut(move |sock| {
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();
let ctrl = controller::new().run();
@ -147,8 +155,6 @@ fn tcp_waits_for_proxies_to_close() {
let tcp_client = client.connect();
shdn.signal();
tcp_client.write(msg1);
assert_eq!(tcp_client.read(), msg2.as_bytes());
}