rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Loosen timeout restrictions

Browse Source
This commit is contained in:
Steven Fackler
2015-05-29 19:09:29 -07:00
parent 494901a8b4
commit b5c6c7ed40
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/net/udp.rs
View File

@@ -389,17 +389,15 @@ mod tests {
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 @@ mod tests {
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 @@ mod tests {
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));
}
}