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_upgrade_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_upgrade_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_upgrade_SUITE.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl index f5f4b25b23..113b3b4158 100644 --- a/lib/ssl/test/ssl_upgrade_SUITE.erl +++ b/lib/ssl/test/ssl_upgrade_SUITE.erl @@ -47,8 +47,8 @@ init_per_suite(Config0) -> {skip, Reason}; Config -> Result = - {ok, _} = make_certs:all(?config(data_dir, Config), - ?config(priv_dir, Config)), + {ok, _} = make_certs:all(proplists:get_value(data_dir, Config), + proplists:get_value(priv_dir, Config)), ssl_test_lib:cert_options(Config) end catch _:_ -> @@ -60,7 +60,7 @@ end_per_suite(Config) -> crypto:stop(). init_per_testcase(_TestCase, Config) -> - ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]), + ssl_test_lib:ct_log_supported_protocol_versions(Config), ct:timetrap({minutes, 1}), Config. @@ -139,8 +139,8 @@ use_connection(Socket) -> end. soft_start_connection(Config, ResulProxy) -> - 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 = start_server([{node, ServerNode}, {port, 0}, {from, ResulProxy}, @@ -156,8 +156,8 @@ soft_start_connection(Config, ResulProxy) -> {Server, Client}. restart_start_connection(Config, ResulProxy) -> - 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 = start_server([{node, ServerNode}, {port, 0}, {from, ResulProxy}, |