aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_upgrade_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-12 11:54:25 +0200
committerIngela Anderton Andin <[email protected]>2016-05-20 09:05:49 +0200
commitaa6c59f6416ce1685f605d99795edfcbc74d4b8d (patch)
tree2093ca5dadf9bc6c5719263e99b2f7cf984f81e1 /lib/ssl/test/ssl_upgrade_SUITE.erl
parent0b1db10a6956c58b0eb9251c81c7df88addfe21b (diff)
downloadotp-aa6c59f6416ce1685f605d99795edfcbc74d4b8d.tar.gz
otp-aa6c59f6416ce1685f605d99795edfcbc74d4b8d.tar.bz2
otp-aa6c59f6416ce1685f605d99795edfcbc74d4b8d.zip
ssl: Remove use of test_server config macro
Diffstat (limited to 'lib/ssl/test/ssl_upgrade_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_upgrade_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index 3975fbb5de..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 _:_ ->
@@ -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},