diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-16 09:24:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-16 09:24:14 +0200 |
| commit | 636f9b56707ba9bafba531a7fe2235f3677ff0a4 (patch) | |
| tree | 37eef84d6a911238c885df6e9d92951fdbdc99a7 | |
| parent | 5c83eeffcc8c5cece2ea4bf558988304d2fc11ce (diff) | |
| parent | 798ab82d924677444888bf5d68d406f5548e797c (diff) | |
| download | otp-636f9b56707ba9bafba531a7fe2235f3677ff0a4.tar.gz otp-636f9b56707ba9bafba531a7fe2235f3677ff0a4.tar.bz2 otp-636f9b56707ba9bafba531a7fe2235f3677ff0a4.zip | |
Merge branch 'maint'
| -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. |