diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-16 09:23:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-16 09:23:50 +0200 |
| commit | 798ab82d924677444888bf5d68d406f5548e797c (patch) | |
| tree | b0d7c04669ea84b4a700ad04446e8af63fd092fb /lib/ssl | |
| parent | 179f61eb3377098083c72b3fff793e6c45a68b11 (diff) | |
| parent | bee841ab25e321961d9f2e5fe7c2a769b6a2c572 (diff) | |
| download | otp-798ab82d924677444888bf5d68d406f5548e797c.tar.gz otp-798ab82d924677444888bf5d68d406f5548e797c.tar.bz2 otp-798ab82d924677444888bf5d68d406f5548e797c.zip | |
Merge branch 'ia/ssl/test-cuddle' into maint
* ia/ssl/test-cuddle:
ssl: Test case stability
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 2f440f1f3c..1da4e88077 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -1371,6 +1371,7 @@ tcp_connect_big() -> [{doc,"Test what happens when a tcp tries to connect, i,e. a bad big (ssl) packet is sent first"}]. tcp_connect_big(Config) when is_list(Config) -> + process_flag(trap_exit, true), ServerOpts = ?config(server_opts, Config), {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config), TcpOpts = [binary, {reuseaddr, true}], @@ -1396,7 +1397,9 @@ tcp_connect_big(Config) when is_list(Config) -> {Server, {error, timeout}} -> ct:fail("hangs"); {Server, {error, Error}} -> - ct:log("Error ~p", [Error]) + ct:log("Error ~p", [Error]); + {'EXIT', Server, _} -> + ok end end. |