---

yaml
---
r: 211787
b: refs/heads/auto
c: 39abcef
h: refs/heads/master
i:
  211785: 39ab79c
  211783: a88f7f9
v: v3

Author: sfackler

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 69a0e1af9553ad50ee2d9c9176470ddeef70717c
+refs/heads/auto: 39abcef0a792579b5712ff03138c4822058e9582
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -941,7 +941,9 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
-        assert!(wait < Duration::from_millis(15));
+        // 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));
     }
 
     #[test]
@@ -964,6 +966,8 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
-        assert!(wait < Duration::from_millis(15));
+        // 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));
     }
 }

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

@@ -397,7 +397,9 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
-        assert!(wait < Duration::from_millis(15));
+        // 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));
     }
 
     #[test]
@@ -418,6 +420,8 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
-        assert!(wait < Duration::from_millis(15));
+        // 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));
     }
 }