diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-16 10:48:22 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-16 10:48:22 +0200 |
| commit | c019481b3ff418de76886b955ba9238a12ea856a (patch) | |
| tree | 9d958a8db8aca4632efcb3bfabf64c53995258e6 /lib/ssl/test/ssl_test_lib.erl | |
| parent | a12b70fa98eee10650c9de78d7d91516a2989999 (diff) | |
| parent | b2c0bef3cff85784b2ccb3b91bbea997acab6187 (diff) | |
| download | otp-c019481b3ff418de76886b955ba9238a12ea856a.tar.gz otp-c019481b3ff418de76886b955ba9238a12ea856a.tar.bz2 otp-c019481b3ff418de76886b955ba9238a12ea856a.zip | |
Merge branch 'ia/ssl/register-unique-session/OTP-12980' into maint
* ia/ssl/register-unique-session/OTP-12980:
ssl: Correct return value of default session callback module
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 8317148aa5..ba8588f2f9 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -241,7 +241,21 @@ close(Pid) -> receive {'DOWN', Monitor, process, Pid, Reason} -> erlang:demonitor(Monitor), - ct:log("~p:~p~nPid: ~p down due to:~p ~n", [?MODULE,?LINE, Pid, Reason]) + ct:log("~p:~p~nPid: ~p down due to:~p ~n", [?MODULE,?LINE, Pid, Reason]) + + end. + +close(Pid, Timeout) -> + ct:log("~p:~p~n Close ~p ~n", [?MODULE,?LINE, Pid]), + Monitor = erlang:monitor(process, Pid), + Pid ! close, + receive + {'DOWN', Monitor, process, Pid, Reason} -> + erlang:demonitor(Monitor), + ct:log("~p:~p~nPid: ~p down due to:~p ~n", [?MODULE,?LINE, Pid, Reason]) + after + Timeout -> + exit(Pid, kill) end. check_result(Server, ServerMsg, Client, ClientMsg) -> @@ -360,7 +374,7 @@ cert_options(Config) -> SNIServerAKeyFile = filename:join([?config(priv_dir, Config), "a.server", "key.pem"]), SNIServerBCertFile = filename:join([?config(priv_dir, Config), "b.server", "cert.pem"]), SNIServerBKeyFile = filename:join([?config(priv_dir, Config), "b.server", "key.pem"]), - [{client_opts, [{ssl_imp, new},{reuseaddr, true}]}, + [{client_opts, []}, {client_verification_opts, [{cacertfile, ClientCaCertFile}, {certfile, ClientCertFile}, {keyfile, ClientKeyFile}, |