From 3686c6cbcf6fb5a7a07c852af632a590bc52d74b Mon Sep 17 00:00:00 2001 From: klutzy Date: Mon, 16 Sep 2013 03:45:20 +0900 Subject: [PATCH] std::rt::io::net::tcp: Fix one tcp test on Win32 Fixes `connect_error` part of #8811. --- src/libstd/rt/io/net/tcp.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs index be8a051a0664..55abc4ab1358 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 };