OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #14046 : alexcrichton/rust/ignore-a-test-on-freebsd, r=kballard

Browse Source 
This test runs successfully manually, but the bots are having trouble getting
this test to pass. Ignore it on freebsd for now.
This commit is contained in:
bors 2014-05-09 11:01:42 -07:00
commit 47ecc2e889
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,21 +947,26 @@ mod test {
// Also make sure that even though the timeout is expired that we will
// continue to receive any pending connections.
let (tx, rx) = channel();
spawn(proc() {
tx.send(TcpStream::connect(addr).unwrap());
});
let l = rx.recv();
for i in range(0, 1001) {
match a.accept() {
Ok(..) => break,
Err(ref e) if e.kind == TimedOut => {}
Err(e) => fail!("error: {}", e),
//
// FIXME: freebsd apparently never sees the pending connection, but
// testing manually always works. Need to investigate this
// flakiness.
if !cfg!(target_os = "freebsd") {
let (tx, rx) = channel();
spawn(proc() {
tx.send(TcpStream::connect(addr).unwrap());
});
let l = rx.recv();
for i in range(0, 1001) {
match a.accept() {
Ok(..) => break,
Err(ref e) if e.kind == TimedOut => {}
Err(e) => fail!("error: {}", e),
}
::task::deschedule();
if i == 1000 { fail!("should have a pending connection") }
}
::task::deschedule();
if i == 1000 { fail!("should have a pending connection") }
}
drop(l);
// Unset the timeout and make sure that this always blocks.
a.set_timeout(None);