aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/inets_app_test.erl
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang-solutions.com>2012-10-01 11:49:35 +0200
committerLukas Larsson <lukas@erlang-solutions.com>2012-10-22 15:57:19 +0200
commitccd1f6cd206683a200f928c2e568c0ca4906ff80 (patch)
treeee4aca36ea750da63876f2d36d6b981a8f8c633b /lib/inets/test/inets_app_test.erl
parent4cae6c0da2dc64c40f3c6081dedc33e21214a889 (diff)
downloadotp-ccd1f6cd206683a200f928c2e568c0ca4906ff80.tar.gz
otp-ccd1f6cd206683a200f928c2e568c0ca4906ff80.tar.bz2
otp-ccd1f6cd206683a200f928c2e568c0ca4906ff80.zip
Move crypto check so that tc is skipped and not failed
Diffstat (limited to 'lib/inets/test/inets_app_test.erl')
-rw-r--r--lib/inets/test/inets_app_test.erl16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl
index db2218f3b6..d32f7e290b 100644
--- a/lib/inets/test/inets_app_test.erl
+++ b/lib/inets/test/inets_app_test.erl
@@ -35,6 +35,15 @@
init_per_testcase(undef_funcs, Config) ->
NewConfig = lists:keydelete(watchdog, 1, Config),
Dog = test_server:timetrap(inets_test_lib:minutes(10)),
+
+ %% We need to check if there is a point to run this test.
+ %% On some platforms, crypto will not build, which in turn
+ %% causes ssl to not build (at this time, this will
+ %% change in the future).
+ %% So, we first check if we can start crypto, and if not,
+ %% we skip this test case!
+ ?ENSURE_STARTED(crypto),
+
[{watchdog, Dog}| NewConfig];
init_per_testcase(_, Config) ->
Config.
@@ -240,13 +249,6 @@ undef_funcs(suite) ->
undef_funcs(doc) ->
[];
undef_funcs(Config) when is_list(Config) ->
- %% We need to check if there is a point to run this test.
- %% On some platforms, crypto will not build, which in turn
- %% causes ssl to not build (at this time, this will
- %% change in the future).
- %% So, we first check if we can start crypto, and if not,
- %% we skip this test case!
- ?ENSURE_STARTED(crypto),
App = inets,
AppFile = key1search(app_file, Config),
Mods = key1search(modules, AppFile),