diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-16 15:50:41 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-03-16 15:50:41 +0100 |
| commit | 62a6217ff9dff0418ae436c68b65a8b64461790a (patch) | |
| tree | e09a364da922dd0a63bcb7b8059eded2834a6494 /lib/ssl/test/ssl_test_lib.erl | |
| parent | bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee (diff) | |
| download | otp-62a6217ff9dff0418ae436c68b65a8b64461790a.tar.gz otp-62a6217ff9dff0418ae436c68b65a8b64461790a.tar.bz2 otp-62a6217ff9dff0418ae436c68b65a8b64461790a.zip | |
ssl: Handle EXIT messages from test code correctly
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 26ef311615..e531494f0b 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1467,7 +1467,9 @@ supports_ssl_tls_version(sslv2 = Version) -> Exe = "openssl", Args = ["s_client", VersionFlag], Port = ssl_test_lib:portable_open_port(Exe, Args), - do_supports_ssl_tls_version(Port, "") + Bool = do_supports_ssl_tls_version(Port, ""), + consume_port_exit(Port), + Bool end; supports_ssl_tls_version(Version) -> @@ -1585,6 +1587,12 @@ tls_version('dtlsv1.2' = Atom) -> tls_version(Atom) -> tls_record:protocol_version(Atom). +consume_port_exit(OpenSSLPort) -> + receive + {'EXIT', OpenSSLPort, _} -> + ok + end. + hardcode_rsa_key(1) -> #'RSAPrivateKey'{ version = 'two-prime', |