aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2012-11-26 11:44:31 +0100
committerIngela Anderton Andin <ingela@erlang.org>2012-11-27 09:33:59 +0100
commitc63fcce283f26306be890e7153f2941948eef0f8 (patch)
tree4349796f786b40ad9ed20c20b0c892e311037516 /lib/ssl
parent680f37089808f002e92f14742c3e9d7a813c83be (diff)
downloadotp-c63fcce283f26306be890e7153f2941948eef0f8.tar.gz
otp-c63fcce283f26306be890e7153f2941948eef0f8.tar.bz2
otp-c63fcce283f26306be890e7153f2941948eef0f8.zip
ssl: Receive port EXIT-message so that it does not get mixed up with the protocol-error message we are expecting
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 98ef050b14..f4e19b3f87 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1080,14 +1080,13 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
OpenSslPort = open_port({spawn, Cmd}, [stderr_to_stdout]),
port_command(OpenSslPort, Data),
-
+ receive
+ {'EXIT', OpenSslPort, _} ->
+ ok
+
+ end,
ssl_test_lib:check_result(Server, {error,"protocol version"}),
-
- %% Clean close down! Server needs to be closed first !!
- ssl_test_lib:close(Server),
- close_port(OpenSslPort),
- process_flag(trap_exit, false),
- ok.
+ process_flag(trap_exit, false).
%%--------------------------------------------------------------------
erlang_client_openssl_server_npn(doc) ->