about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorklutzy <klutzytheklutzy@gmail.com>2013-09-16 03:45:20 +0900
committerklutzy <klutzytheklutzy@gmail.com>2013-09-16 03:45:20 +0900
commit3686c6cbcf6fb5a7a07c852af632a590bc52d74b (patch)
treef9e38666abab296e49530b29026f4100ce5d2f68 /src/libstd/rt
parent879cfe6049647cf8ecf31682b26e28b905f7d27e (diff)
downloadrust-3686c6cbcf6fb5a7a07c852af632a590bc52d74b.tar.gz
rust-3686c6cbcf6fb5a7a07c852af632a590bc52d74b.zip
std::rt::io::net::tcp: Fix one tcp test on Win32
Fixes `connect_error` part of #8811.
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/io/net/tcp.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs
index be8a051a066..55abc4ab135 100644
--- a/src/libstd/rt/io/net/tcp.rs
+++ b/src/libstd/rt/io/net/tcp.rs
@@ -178,12 +178,17 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME #8811
     fn connect_error() {
         do run_in_mt_newsched_task {
             let mut called = false;
             do io_error::cond.trap(|e| {
-                assert_eq!(e.kind, ConnectionRefused);
+                let expected_error = if cfg!(unix) {
+                    ConnectionRefused
+                } else {
+                    // On Win32, opening port 1 gives WSAEADDRNOTAVAIL error.
+                    OtherIoError
+                };
+                assert_eq!(e.kind, expected_error);
                 called = true;
             }).inside {
                 let addr = SocketAddr { ip: Ipv4Addr(0, 0, 0, 0), port: 1 };