mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rollup merge of #18985: alexcrichton/issue-18900

Browse Source
This commit is contained in:
Jakub Bukaj 2014-11-16 10:22:28 +01:00
commit 086b2974de
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/libstd/io/net/tcp.rs
View File

@ -661,23 +661,22 @@ mod test {
let addr = next_test_ip4();
let mut acceptor = TcpListener::bind(addr).listen();
let (tx, rx) = channel();
spawn(proc() {
let _stream = TcpStream::connect(addr);
// Close
drop(TcpStream::connect(addr));
tx.send(());
});
let mut stream = acceptor.accept();
rx.recv();
let buf = [0];
loop {
match stream.write(buf) {
Ok(..) => {}
Err(e) => {
assert!(e.kind == ConnectionReset ||
e.kind == BrokenPipe ||
e.kind == ConnectionAborted,
"unknown error: {}", e);
break;
}
match stream.write(buf) {
Ok(..) => {}
Err(e) => {
assert!(e.kind == ConnectionReset ||
e.kind == BrokenPipe ||
e.kind == ConnectionAborted,
"unknown error: {}", e);
}
}
}
@ -687,23 +686,22 @@ mod test {
let addr = next_test_ip6();
let mut acceptor = TcpListener::bind(addr).listen();
let (tx, rx) = channel();
spawn(proc() {
let _stream = TcpStream::connect(addr);
// Close
drop(TcpStream::connect(addr));
tx.send(());
});
let mut stream = acceptor.accept();
rx.recv();
let buf = [0];
loop {
match stream.write(buf) {
Ok(..) => {}
Err(e) => {
assert!(e.kind == ConnectionReset ||
e.kind == BrokenPipe ||
e.kind == ConnectionAborted,
"unknown error: {}", e);
break;
}
match stream.write(buf) {
Ok(..) => {}
Err(e) => {
assert!(e.kind == ConnectionReset ||
e.kind == BrokenPipe ||
e.kind == ConnectionAborted,
"unknown error: {}", e);
}
}
}