aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-01-24 10:16:10 -0800
committerGitHub <[email protected]>2018-01-24 10:16:10 -0800
commite66f6dff92291588706dc2e8c59670aac0f5dc5d (patch)
tree20f0211592af52259293eb16e54a5994976088b6 /openssl/src
parentEvict registry cache (diff)
parenttests: if server failed to start, print exit code instead of timing out (diff)
downloadrust-openssl-e66f6dff92291588706dc2e8c59670aac0f5dc5d.tar.xz
rust-openssl-e66f6dff92291588706dc2e8c59670aac0f5dc5d.zip
Merge pull request #830 from stepancheg/try-wait
tests: if server failed to start, print exit code instead of timing out
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/test.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/openssl/src/ssl/test.rs b/openssl/src/ssl/test.rs
index db478d36..dc58c4fa 100644
--- a/openssl/src/ssl/test.rs
+++ b/openssl/src/ssl/test.rs
@@ -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),