mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 08:37:14 +00:00
Loosen timeout restrictions
This commit is contained in:
parent
494901a8b4
commit
b5c6c7ed40
|
@ -933,17 +933,15 @@ fn test_read_timeout() {
|
|||
let listener = t!(TcpListener::bind(&addr));
|
||||
|
||||
let mut stream = t!(TcpStream::connect(&("localhost", addr.port())));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(10))));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(1000))));
|
||||
|
||||
let mut buf = [0; 10];
|
||||
let wait = Duration::span(|| {
|
||||
let kind = stream.read(&mut buf).err().expect("expected error").kind();
|
||||
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
|
||||
});
|
||||
assert!(wait > Duration::from_millis(5));
|
||||
// windows will sometimes extend this by ~500ms, so we'll just take the
|
||||
// fact that we did time out as a win :(
|
||||
assert!(cfg!(windows) || wait < Duration::from_millis(15));
|
||||
assert!(wait > Duration::from_millis(400));
|
||||
assert!(wait < Duration::from_millis(1600));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
@ -952,7 +950,7 @@ fn test_read_with_timeout() {
|
|||
let listener = t!(TcpListener::bind(&addr));
|
||||
|
||||
let mut stream = t!(TcpStream::connect(&("localhost", addr.port())));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(10))));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(1000))));
|
||||
|
||||
let mut other_end = t!(listener.accept()).0;
|
||||
t!(other_end.write_all(b"hello world"));
|
||||
|
@ -965,9 +963,7 @@ fn test_read_with_timeout() {
|
|||
let kind = stream.read(&mut buf).err().expect("expected error").kind();
|
||||
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
|
||||
});
|
||||
assert!(wait > Duration::from_millis(5));
|
||||
// windows will sometimes extend this by ~500ms, so we'll just take the
|
||||
// fact that we did time out as a win :(
|
||||
assert!(cfg!(windows) || wait < Duration::from_millis(15));
|
||||
assert!(wait > Duration::from_millis(400));
|
||||
assert!(wait < Duration::from_millis(1600));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -389,17 +389,15 @@ fn test_read_timeout() {
|
|||
let addr = next_test_ip4();
|
||||
|
||||
let mut stream = t!(UdpSocket::bind(&addr));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(10))));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(1000))));
|
||||
|
||||
let mut buf = [0; 10];
|
||||
let wait = Duration::span(|| {
|
||||
let kind = stream.recv_from(&mut buf).err().expect("expected error").kind();
|
||||
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
|
||||
});
|
||||
assert!(wait > Duration::from_millis(5));
|
||||
// windows will sometimes extend this by ~500ms, so we'll just take the
|
||||
// fact that we did time out as a win :(
|
||||
assert!(cfg!(windows) || wait < Duration::from_millis(15));
|
||||
assert!(wait > Duration::from_millis(400));
|
||||
assert!(wait < Duration::from_millis(1600));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
@ -407,7 +405,7 @@ fn test_read_with_timeout() {
|
|||
let addr = next_test_ip4();
|
||||
|
||||
let mut stream = t!(UdpSocket::bind(&addr));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(10))));
|
||||
t!(stream.set_read_timeout(Some(Duration::from_millis(1000))));
|
||||
|
||||
t!(stream.send_to(b"hello world", &addr));
|
||||
|
||||
|
@ -419,9 +417,7 @@ fn test_read_with_timeout() {
|
|||
let kind = stream.recv_from(&mut buf).err().expect("expected error").kind();
|
||||
assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
|
||||
});
|
||||
assert!(wait > Duration::from_millis(5));
|
||||
// windows will sometimes extend this by ~500ms, so we'll just take the
|
||||
// fact that we did time out as a win :(
|
||||
assert!(cfg!(windows) || wait < Duration::from_millis(15));
|
||||
assert!(wait > Duration::from_millis(400));
|
||||
assert!(wait < Duration::from_millis(1600));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue