diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-23 11:52:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-23 11:52:10 +0200 |
| commit | d2d183899ff81a5d0f983943f186e9b83d97c6ef (patch) | |
| tree | 1a7388d84b8eea3caa448c3c26e84fb4afe02cbc /lib/ssl/test/ssl_session_cache_SUITE.erl | |
| parent | ad9ff167ab254993597ffaa84256bac0bdf5520e (diff) | |
| parent | a46e6a149481495198b2cbee3d7ec56ba2c0eb0f (diff) | |
| download | otp-d2d183899ff81a5d0f983943f186e9b83d97c6ef.tar.gz otp-d2d183899ff81a5d0f983943f186e9b83d97c6ef.tar.bz2 otp-d2d183899ff81a5d0f983943f186e9b83d97c6ef.zip | |
Merge branch 'ingela/ssl/test-enhancment'
* ingela/ssl/test-enhancment:
ssl: Increase timeout
ssl: Remove use of test_server config macro
ssl: Disable DTLS test for now
ssl: move TLS/DTLS version logging into helper
ssl: tests for DTLS
Diffstat (limited to 'lib/ssl/test/ssl_session_cache_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 85345c814f..5e6137d2a6 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -60,8 +60,8 @@ init_per_suite(Config0) -> ok -> ssl:start(), %% make rsa certs using - {ok, _} = make_certs:all(?config(data_dir, Config0), - ?config(priv_dir, Config0)), + {ok, _} = make_certs:all(proplists:get_value(data_dir, Config0), + proplists:get_value(priv_dir, Config0)), Config = ssl_test_lib:make_dsa_cert(Config0), ssl_test_lib:cert_options(Config) catch _:_ -> @@ -154,8 +154,8 @@ client_unique_session() -> "sets up many connections"}]. client_unique_session(Config) when is_list(Config) -> process_flag(trap_exit, true), - ClientOpts = ?config(client_opts, Config), - ServerOpts = ?config(server_opts, Config), + ClientOpts = proplists:get_value(client_opts, Config), + ServerOpts = proplists:get_value(server_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, @@ -185,8 +185,8 @@ session_cleanup() -> "does not grow and grow ..."}]. session_cleanup(Config) when is_list(Config) -> process_flag(trap_exit, true), - ClientOpts = ?config(client_opts, Config), - ServerOpts = ?config(server_opts, Config), + ClientOpts = ssl_test_lib:ssl_options(client_opts, Config), + ServerOpts = ssl_test_lib:ssl_options(server_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Server = @@ -259,8 +259,8 @@ max_table_size() -> [{doc,"Test max limit on session table"}]. max_table_size(Config) when is_list(Config) -> process_flag(trap_exit, true), - ClientOpts = ?config(client_verification_opts, Config), - ServerOpts = ?config(server_verification_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 = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, |