Unverified Commit e66f6dff authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #830 from stepancheg/try-wait 

tests: if server failed to start, print exit code instead of timing out
parents 38ddad99 81f7d178

openssl/src/ssl/test.rs

+4 −1
Original line number Diff line number Diff line
@@ -82,11 +82,14 @@ impl Server { 
    }



    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 {

            match TcpStream::connect(&addr) {

                Ok(s) => return (server, s),

                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));

                }

                Err(e) => panic!("wut: {}", e),