---

yaml
---
r: 82141
b: refs/heads/master
c: ade57d9
h: refs/heads/master
i:
  82139: 35b4c2f
v: v3

Author: klutzy

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8aadcd4851d90adfb32da6ba8da3e7e29d97c28e
+refs/heads/master: ade57d9f5827f0753cd0acee025f830a5256a78a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/libstd/rt/io/net/tcp.rs

@@ -306,7 +306,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME #8811
     fn read_eof_twice_ip4() {
         do run_in_mt_newsched_task {
             let addr = next_test_ip4();
@@ -321,8 +320,16 @@ mod test {
                 let mut buf = [0];
                 let nread = stream.read(buf);
                 assert!(nread.is_none());
-                let nread = stream.read(buf);
-                assert!(nread.is_none());
+                do read_error::cond.trap(|e| {
+                    if cfg!(windows) {
+                        assert_eq!(e.kind, NotConnected);
+                    } else {
+                        fail2!();
+                    }
+                }).inside {
+                    let nread = stream.read(buf);
+                    assert!(nread.is_none());
+                }
             }
 
             do spawntask {
@@ -334,7 +341,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME #8811
     fn read_eof_twice_ip6() {
         do run_in_mt_newsched_task {
             let addr = next_test_ip6();
@@ -349,8 +355,16 @@ mod test {
                 let mut buf = [0];
                 let nread = stream.read(buf);
                 assert!(nread.is_none());
-                let nread = stream.read(buf);
-                assert!(nread.is_none());
+                do read_error::cond.trap(|e| {
+                    if cfg!(windows) {
+                        assert_eq!(e.kind, NotConnected);
+                    } else {
+                        fail2!();
+                    }
+                }).inside {
+                    let nread = stream.read(buf);
+                    assert!(nread.is_none());
+                }
             }
 
             do spawntask {