diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-04-29 17:25:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-23 18:21:11 +0200 |
| commit | 7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9 (patch) | |
| tree | 62e5c69bde3ff611d4da725939a50a04673d20de /lib/inets/test/httpc_proxy_SUITE.erl | |
| parent | c8cd6f30021d5f28e06d89a6acf834d770b9e972 (diff) | |
| download | otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.gz otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.bz2 otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.zip | |
inets: Use test_server app tests and remove legacy test_server code
FTP tests needed some refactoring as some tests where lost to
the ftp_suite_lib module that was not run.
Diffstat (limited to 'lib/inets/test/httpc_proxy_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_proxy_SUITE.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/inets/test/httpc_proxy_SUITE.erl b/lib/inets/test/httpc_proxy_SUITE.erl index 2f6f0bc26f..198b245399 100644 --- a/lib/inets/test/httpc_proxy_SUITE.erl +++ b/lib/inets/test/httpc_proxy_SUITE.erl @@ -141,7 +141,7 @@ end_per_testcase(_Case, Config) -> %% internal functions apps(_Case, Config) -> - case ?config(protocol, Config) of + case proplists:get_value(protocol, Config) of https -> [ssl]; _ -> @@ -438,7 +438,7 @@ header_value(Name, [{HeaderName,HeaderValue}|Headers]) -> https_connect_error(doc) -> ["Error from CONNECT tunnel should be returned"]; https_connect_error(Config) when is_list(Config) -> - {HttpServer,HttpPort} = ?config(http, Config), + {HttpServer,HttpPort} = proplists:get_value(http, Config), Method = get, %% using HTTPS scheme with HTTP port to trigger connection error URL = "https://" ++ HttpServer ++ ":" ++ @@ -477,7 +477,7 @@ app_start(App, Config) -> inets -> application:stop(App), ok = application:start(App), - case ?config(proxy, Config) of + case proplists:get_value(proxy, Config) of undefined -> ok; {_,ProxySpec} -> ok = httpc:set_options([{proxy,ProxySpec}]) @@ -495,7 +495,7 @@ app_stop(App) -> application:stop(App). make_cert_files(Alg, Prefix, Config) -> - PrivDir = ?config(priv_dir, Config), + PrivDir = proplists:get_value(priv_dir, Config), CaInfo = {CaCert,_} = erl_make_certs:make_cert([{key,Alg}]), {Cert,CertKey} = erl_make_certs:make_cert([{key,Alg},{issuer,CaInfo}]), CaCertFile = filename:join(PrivDir, Prefix++"cacerts.pem"), @@ -513,8 +513,8 @@ der_to_pem(File, Entries) -> url(AbsPath, Config) -> - Protocol = ?config(protocol, Config), - {ServerName,ServerPort} = ?config(Protocol, Config), + Protocol = proplists:get_value(protocol, Config), + {ServerName,ServerPort} = proplists:get_value(Protocol, Config), atom_to_list(Protocol) ++ "://" ++ ServerName ++ ":" ++ integer_to_list(ServerPort) ++ AbsPath. @@ -548,8 +548,8 @@ init_local_proxy_string(String, Config) -> |Config]. rcmd_local_proxy(Args, Config) -> - DataDir = ?config(data_dir, Config), - PrivDir = ?config(priv_dir, Config), + DataDir = proplists:get_value(data_dir, Config), + PrivDir = proplists:get_value(priv_dir, Config), Script = filename:join(DataDir, ?LOCAL_PROXY_SCRIPT), rcmd(Script, Args, [{cd,PrivDir}]). |