diff options
| author | Erlang/OTP <[email protected]> | 2019-06-17 16:51:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-17 16:51:17 +0200 |
| commit | a3b1191abf3d5c0157f51d915053bcca6bec107c (patch) | |
| tree | 986b47b93fe565e03e6a3f2f3fe3639f2a90a844 /lib/ssl/test/ssl_test_lib.erl | |
| parent | ff0ac9ba35a5c8790c8cd3cda1b68fc59cc37449 (diff) | |
| parent | 021607a213435344db07662bc79ea4895b6b94e6 (diff) | |
| download | otp-a3b1191abf3d5c0157f51d915053bcca6bec107c.tar.gz otp-a3b1191abf3d5c0157f51d915053bcca6bec107c.tar.bz2 otp-a3b1191abf3d5c0157f51d915053bcca6bec107c.zip | |
Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maint-22
* peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888:
ssl: Fix negative tests in ssl_basic_SUITE
ssl: Fix run_client_error/1 in ssl_test_lib
ssl: Fix ssl_handshake:extension_value/1
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 832f8494c6..d46ba1f787 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1103,7 +1103,15 @@ run_client_error(Opts) -> Options = proplists:get_value(options, Opts), ct:log("~p:~p~nssl:connect(~p, ~p, ~p)~n", [?MODULE,?LINE, Host, Port, Options]), Error = Transport:connect(Host, Port, Options), - Pid ! {self(), Error}. + case Error of + {error, _} -> + Pid ! {self(), Error}; + {ok, _Socket} -> + receive + {ssl_error, _, {tls_alert, _}} = SslError -> + Pid ! {self(), SslError} + end + end. accepters(N) -> accepters([], N). |