aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2017-10-10 18:35:09 +0200
committerIngela Anderton Andin <ingela@erlang.org>2017-10-12 12:05:39 +0200
commit07a918f5342fe4f0f9cd97dad0db274cd144e04b (patch)
tree2bb9f4342265fc76e14cc4ad832ae20bb66f73a1 /lib
parentc030104256344756420d819b1b1381777c216a38 (diff)
downloadotp-07a918f5342fe4f0f9cd97dad0db274cd144e04b.tar.gz
otp-07a918f5342fe4f0f9cd97dad0db274cd144e04b.tar.bz2
otp-07a918f5342fe4f0f9cd97dad0db274cd144e04b.zip
inets: httpc - fix default timeout in httpc_SUITE
Timeout must be set in suite/0 or init_per_testcase not init_per_group or init_per_suite
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/test/httpc_SUITE.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index e6dcd2285f..5dfb1474e5 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -42,7 +42,8 @@
%% Common Test interface functions -----------------------------------
%%--------------------------------------------------------------------
suite() ->
- [{ct_hooks,[ts_install_cth]}
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap,{seconds, 30}}
].
all() ->
@@ -142,7 +143,6 @@ misc() ->
%%--------------------------------------------------------------------
init_per_suite(Config) ->
- ct:timetrap({seconds, 30}),
PrivDir = proplists:get_value(priv_dir, Config),
DataDir = proplists:get_value(data_dir, Config),
inets_test_lib:start_apps([inets]),
@@ -169,7 +169,6 @@ init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https->
catch crypto:stop(),
try crypto:start() of
ok ->
- ct:timetrap({seconds, 30}),
start_apps(Group),
do_init_per_group(Group, Config0)
catch