diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-12 12:06:39 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-12 12:06:39 +0200 |
| commit | f37f9eac178836e6bcdf575fa4c72642f146de35 (patch) | |
| tree | 2bb9f4342265fc76e14cc4ad832ae20bb66f73a1 /lib/inets/test | |
| parent | becaa0972e42bb0ecedae3aeaba5be221a551fa4 (diff) | |
| parent | 07a918f5342fe4f0f9cd97dad0db274cd144e04b (diff) | |
| download | otp-f37f9eac178836e6bcdf575fa4c72642f146de35.tar.gz otp-f37f9eac178836e6bcdf575fa4c72642f146de35.tar.bz2 otp-f37f9eac178836e6bcdf575fa4c72642f146de35.zip | |
Merge branch 'ingela/inets/cgi-env/OTP-14679' into maint
* ingela/inets/cgi-env/OTP-14679:
inets: httpc - fix default timeout in httpc_SUITE
inets: ENV should be a string
Diffstat (limited to 'lib/inets/test')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 5 |
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 |