Skip to content

Commit 21de6b6

Browse files
committed
tests(client): improve panic message when client tests fail
1 parent 3dc2228 commit 21de6b6

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

tests/client.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,26 @@ macro_rules! test {
6868

6969
let (tx, rx) = oneshot::channel();
7070

71-
thread::spawn(move || {
71+
let thread = thread::Builder::new()
72+
.name(format!("tcp-server<{}>", stringify!($name)));
73+
thread.spawn(move || {
7274
let mut inc = server.accept().unwrap().0;
7375
inc.set_read_timeout(Some(Duration::from_secs(5))).unwrap();
7476
inc.set_write_timeout(Some(Duration::from_secs(5))).unwrap();
7577
let expected = format!($server_expected, addr=addr);
7678
let mut buf = [0; 4096];
7779
let mut n = 0;
7880
while n < buf.len() && n < expected.len() {
79-
n += inc.read(&mut buf[n..]).unwrap();
81+
n += match inc.read(&mut buf[n..]) {
82+
Ok(n) => n,
83+
Err(e) => panic!("failed to read request, partialy read = {:?}, error: {}", s(&buf[..n]), e),
84+
};
8085
}
8186
assert_eq!(s(&buf[..n]), expected);
8287

8388
inc.write_all($server_reply.as_ref()).unwrap();
8489
let _ = tx.send(());
85-
});
90+
}).unwrap();
8691

8792
let rx = rx.map_err(|_| hyper::Error::Io(io::Error::new(io::ErrorKind::Other, "thread panicked")));
8893

0 commit comments

Comments
 (0)