user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openbsd: adapt connect_error test

Browse source 
The connect_error test check if connecting to "0.0.0.0:1" works (it
shouldn't). And in case of error, the test expects a ConnectionRefused
error.

Under OpenBSD, trying to connect to "0.0.0.0" isn't a ConnectionRefused:
it is an InvalidInput error.

The patch allow the error to be ConnectionRefused or InvalidInput.
This commit is contained in:
Sébastien Marie 2015-02-17 11:11:53 +01:00
parent 81bce5290f
commit 9eeaa3c786
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstd/net/tcp.rs
View file

@ -247,7 +247,8 @@ mod tests {
fn connect_error() {
match TcpStream::connect("0.0.0.0:1") {
Ok(..) => panic!(),
Err(e) => assert_eq!(e.kind(), ErrorKind::ConnectionRefused),
Err(e) => assert!((e.kind() == ErrorKind::ConnectionRefused)
|| (e.kind() == ErrorKind::InvalidInput)),
}
}

4
src/libstd/old_io/net/tcp.rs
View file

@ -494,6 +494,7 @@ mod test {
use old_io::{EndOfFile, TimedOut, ShortWrite, IoError};
use old_io::{ConnectionRefused, BrokenPipe, ConnectionAborted};
use old_io::{ConnectionReset, NotConnected, PermissionDenied, OtherIoError};
use old_io::{InvalidInput};
use old_io::{Acceptor, Listener};
// FIXME #11530 this fails on android because tests are run as root
@ -510,7 +511,8 @@ mod test {
fn connect_error() {
match TcpStream::connect("0.0.0.0:1") {
Ok(..) => panic!(),
Err(e) => assert_eq!(e.kind, ConnectionRefused),
Err(e) => assert!((e.kind == ConnectionRefused)
|| (e.kind == InvalidInput)),
}
}