diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-01-25 11:04:23 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-01-25 11:04:23 +0100 |
| commit | c2a833811c768fc38b51a5241f55eb25786ac13e (patch) | |
| tree | b0dda62b75135d4850fa736f1661afd91b812bda /lib/ssl/test | |
| parent | 7400b93124572af795c8d7356e22e3bf1f1f2a09 (diff) | |
| parent | c6472824546dc8e6914139c2443b926d3f0945cc (diff) | |
| download | otp-c2a833811c768fc38b51a5241f55eb25786ac13e.tar.gz otp-c2a833811c768fc38b51a5241f55eb25786ac13e.tar.bz2 otp-c2a833811c768fc38b51a5241f55eb25786ac13e.zip | |
Merge branch 'ingela/ssl/pem-chache-own-process/OTP-13874' into maint
* ingela/ssl/pem-chache-own-process/OTP-13874:
ssl: Move PEM cache to a dedicated process
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_pem_cache_SUITE.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index de5895d7ba..f0a3c42e8d 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -961,9 +961,9 @@ clear_pem_cache(Config) when is_list(Config) -> {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)), [_, _,_, _, Prop] = StatusInfo, State = ssl_test_lib:state(Prop), - [_,FilRefDb |_] = element(6, State), + [_,{FilRefDb, _} |_] = element(6, State), {Server, Client} = basic_verify_test_no_close(Config), - CountReferencedFiles = fun({_,-1}, Acc) -> + CountReferencedFiles = fun({_, -1}, Acc) -> Acc; ({_, N}, Acc) -> N + Acc diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl index f10d27fbc6..96b15d9b51 100644 --- a/lib/ssl/test/ssl_pem_cache_SUITE.erl +++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl @@ -82,8 +82,8 @@ pem_cleanup() -> [{doc, "Test pem cache invalidate mechanism"}]. pem_cleanup(Config)when is_list(Config) -> process_flag(trap_exit, true), - ClientOpts = proplists:get_value(client_opts, Config), - ServerOpts = proplists:get_value(server_opts, Config), + ClientOpts = proplists:get_value(client_verification_opts, Config), + ServerOpts = proplists:get_value(server_verification_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Server = |