---

yaml
---
r: 214875
b: refs/heads/beta
c: b5c6c7e
h: refs/heads/master
i:
  214873: 34aaf76
  214871: ac26a07
v: v3

Author: sfackler

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 494901a8b46c699b530e7209114bde44b1de4451
+refs/heads/beta: b5c6c7ed408c1c7afb8d4f0430f67255a140d183
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libstd/net/tcp.rs

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

branches/beta/src/libstd/net/udp.rs

@@ -389,25 +389,23 @@ 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]
     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 @@ 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));
     }
 }