diff options
| author | bors <bors@rust-lang.org> | 2015-09-14 18:54:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-14 18:54:01 +0000 |
| commit | 22071ec6417948e156cbac2dc23d18c3dfaebbd7 (patch) | |
| tree | 258de28d7f0f966e21c71e15f6c8b43f99cf4456 /src/libstd | |
| parent | 9da7706dd64bbf055e3f32fe12286a521d8ac7ac (diff) | |
| parent | 224023dfd167afca95665ebf9f927fa1c301f950 (diff) | |
| download | rust-22071ec6417948e156cbac2dc23d18c3dfaebbd7.tar.gz rust-22071ec6417948e156cbac2dc23d18c3dfaebbd7.zip | |
Auto merge of #28403 - sfackler:timeout-cap-removal, r=alexcrichton
Windows's scheduler apparently has "problems" unblocking calls in the asked for time period.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/tcp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net/udp.rs | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index d563ba0b620..5c17ffb9c21 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -954,7 +954,6 @@ mod tests { assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut); }); assert!(wait > Duration::from_millis(400)); - assert!(wait < Duration::from_millis(1600)); } #[test] @@ -977,6 +976,5 @@ mod tests { assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut); }); assert!(wait > Duration::from_millis(400)); - assert!(wait < Duration::from_millis(1600)); } } diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index 74c4416b35b..9e4d38e4615 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -379,7 +379,6 @@ mod tests { assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut); }); assert!(wait > Duration::from_millis(400)); - assert!(wait < Duration::from_millis(1600)); } #[test] @@ -400,6 +399,5 @@ mod tests { assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut); }); assert!(wait > Duration::from_millis(400)); - assert!(wait < Duration::from_millis(1600)); } } |