diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:41:25 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:41:25 +0100 |
| commit | 1bf94703047ae527004dcda59a443d4cd192704a (patch) | |
| tree | 554e42197a020847202b22c98490817ec2d367c4 /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
| parent | 53602cc4c7e4cfb363d93d8452d7323534531886 (diff) | |
| parent | 12858e2acee213181ab5c7e73813179e6ca06bd8 (diff) | |
| download | otp-1bf94703047ae527004dcda59a443d4cd192704a.tar.gz otp-1bf94703047ae527004dcda59a443d4cd192704a.tar.bz2 otp-1bf94703047ae527004dcda59a443d4cd192704a.zip | |
Merge branch 'ia/ssl/tests'
* ia/ssl/tests:
ssl: Avoid test case timing issues
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 4682a109af..68784a175e 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -912,8 +912,16 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) -> {'EXIT', OpenSslPort, _} = Exit -> ct:log("Received: ~p ~n", [Exit]), ok - end, + receive + {'EXIT', _, _} = UnkownExit -> + Msg = lists:flatten(io_lib:format("Received: ~p ~n", [UnkownExit])), + ct:log(Msg), + ct:comment(Msg), + ok + after 0 -> + ok + end, ssl_test_lib:check_result(Server, {error, {tls_alert, "protocol version"}}), process_flag(trap_exit, false). |