auto merge of #10133 : alexcrichton/rust/another-error, r=thestinger

This cropped up on the bsd bot, and if it's an error that gets thrown then it's
fine to just whitelist another type of error in the test.

src/libstd/rt/io/net/unix.rs

@@ -243,7 +243,8 @@ mod tests {
             let mut stop = false;
             while !stop{
                 do io_error::cond.trap(|e| {
-                    assert_eq!(e.kind, BrokenPipe);
+                    assert!(e.kind == BrokenPipe || e.kind == NotConnected,
+                            "unknown error {:?}", e);
                     stop = true;
                 }).inside {
                     server.write(buf);