Check for both TimedOut and WouldBlock in timeout tests

Windows returns TimedOut and everything else returns WouldBlock :(
rust-lang · May 28, 2015 · 8b758a3 · 8b758a3
1 parent bb620b1
commit 8b758a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
@@ -929,8 +929,8 @@ mod tests {
 
         let mut buf = [0; 10];
         let wait = Duration::span(|| {
-            assert_eq!(ErrorKind::WouldBlock,
-                       stream.read(&mut buf).err().expect("expected error").kind());
+            let kind = stream.read(&mut buf).err().expect("expected error").kind();
+            assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
         assert!(wait < Duration::from_millis(15));
@@ -952,8 +952,8 @@ mod tests {
         assert_eq!(b"hello world", &buf[..]);
 
         let wait = Duration::span(|| {
-            assert_eq!(ErrorKind::WouldBlock,
-                       stream.read(&mut buf).err().expect("expected error").kind());
+            let kind = stream.read(&mut buf).err().expect("expected error").kind();
+            assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
         assert!(wait < Duration::from_millis(15));

diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs
@@ -393,8 +393,8 @@ mod tests {
 
         let mut buf = [0; 10];
         let wait = Duration::span(|| {
-            assert_eq!(ErrorKind::WouldBlock,
-                       stream.recv_from(&mut buf).err().expect("expected error").kind());
+            let kind = stream.read(&mut buf).err().expect("expected error").kind();
+            assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
         assert!(wait < Duration::from_millis(15));
@@ -414,8 +414,8 @@ mod tests {
         assert_eq!(b"hello world", &buf[..]);
 
         let wait = Duration::span(|| {
-            assert_eq!(ErrorKind::WouldBlock,
-                       stream.recv_from(&mut buf).err().expect("expected error").kind());
+            let kind = stream.read(&mut buf).err().expect("expected error").kind();
+            assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(5));
         assert!(wait < Duration::from_millis(15));