diff options
| author | bors <bors@rust-lang.org> | 2013-10-28 19:26:23 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-28 19:26:23 -0700 |
| commit | c0222cda27d0a1a06e7f227dfb1f0f6f87d2e742 (patch) | |
| tree | 3fb5d9e753261bf8362e12e1288db2a3ea606edf /src/libstd | |
| parent | 8852cb7713c7867fc97832494588d3bb243136d8 (diff) | |
| parent | 6c75b73a6ae3afd5690c0d1ab80c53e4f0a1fb86 (diff) | |
| download | rust-c0222cda27d0a1a06e7f227dfb1f0f6f87d2e742.tar.gz rust-c0222cda27d0a1a06e7f227dfb1f0f6f87d2e742.zip | |
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.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/io/net/unix.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/rt/io/net/unix.rs b/src/libstd/rt/io/net/unix.rs index e424956e2ff..d9bdb73066d 100644 --- a/src/libstd/rt/io/net/unix.rs +++ b/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); |
