aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-06-09 10:27:58 +0200
committerZandra Hird <[email protected]>2015-06-09 10:27:58 +0200
commit2629a97b9270a84a62aba44ecfb118c007798d96 (patch)
tree197b9fcc27a0f4675b83e6a16beca2993e1589ca
parentbbd68fb2f45ec2089d6f1bbffd2601bf776aa267 (diff)
parent3839fb3857d8ef8a5ace1a3e52758de2149891b2 (diff)
downloadotp-2629a97b9270a84a62aba44ecfb118c007798d96.tar.gz
otp-2629a97b9270a84a62aba44ecfb118c007798d96.tar.bz2
otp-2629a97b9270a84a62aba44ecfb118c007798d96.zip
Merge branch 'scrapinghub/asn1_for_http_proxy_suite'
* scrapinghub/asn1_for_http_proxy_suite: inets: add asn1 to httpc proxy suite
-rw-r--r--lib/inets/test/httpc_proxy_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/test/httpc_proxy_SUITE.erl b/lib/inets/test/httpc_proxy_SUITE.erl
index ddd23d0c65..fbd85e9e42 100644
--- a/lib/inets/test/httpc_proxy_SUITE.erl
+++ b/lib/inets/test/httpc_proxy_SUITE.erl
@@ -79,7 +79,7 @@ local_proxy_cases() ->
%%--------------------------------------------------------------------
init_per_suite(Config0) ->
- case init_apps([crypto,public_key], Config0) of
+ case init_apps(suite_apps(), Config0) of
Config when is_list(Config) ->
make_cert_files(dsa, "server-", Config),
Config;
@@ -94,7 +94,7 @@ end_per_suite(_Config) ->
%% internal functions
suite_apps() ->
- [crypto,public_key].
+ [asn1,crypto,public_key].
%%--------------------------------------------------------------------