min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #830 from stepancheg/try-wait 

tests: if server failed to start, print exit code instead of timing out
This commit is contained in:
Steven Fackler 2018-01-24 10:16:10 -08:00 committed by GitHub
parent 38ddad99af 81f7d17822
commit e66f6dff92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openssl/src/ssl/test.rs
View File

@ -82,11 +82,14 @@ impl Server {
} }
fn new_tcp(args: &[&str]) -> (Server, TcpStream) { fn new_tcp(args: &[&str]) -> (Server, TcpStream) {
let (server, addr) = Server::spawn(args, None); let (mut server, addr) = Server::spawn(args, None);
for _ in 0..20 { for _ in 0..20 {
match TcpStream::connect(&addr) { match TcpStream::connect(&addr) {
Ok(s) => return (server, s), Ok(s) => return (server, s),
Err(ref e) if e.kind() == io::ErrorKind::ConnectionRefused => { Err(ref e) if e.kind() == io::ErrorKind::ConnectionRefused => {
if let Some(exit_status) = server.p.try_wait().expect("try_wait") {
panic!("server exited: {}", exit_status);
}
thread::sleep(Duration::from_millis(100)); thread::sleep(Duration::from_millis(100));
} }
Err(e) => panic!("wut: {}", e), Err(e) => panic!("wut: {}", e),