aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/inets_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erix.ericsson.se>2010-10-12 10:39:40 +0200
committerLukas Larsson <lukas@erix.ericsson.se>2011-02-17 17:25:13 +0100
commitf02cc10b4bda484996b7b93436fcaf8d714cb3da (patch)
treef749029b5264a7a797244cf87eb879a347e18a82 /lib/inets/test/inets_SUITE.erl
parent8bd07f450816eaaae52d28740d89ead1f930cd02 (diff)
downloadotp-f02cc10b4bda484996b7b93436fcaf8d714cb3da.tar.gz
otp-f02cc10b4bda484996b7b93436fcaf8d714cb3da.tar.bz2
otp-f02cc10b4bda484996b7b93436fcaf8d714cb3da.zip
Update inets tests to conform with common_test standard
Diffstat (limited to 'lib/inets/test/inets_SUITE.erl')
-rw-r--r--lib/inets/test/inets_SUITE.erl39
1 files changed, 17 insertions, 22 deletions
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 56983caace..3907e5ac3d 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -19,7 +19,7 @@
%%
-module(inets_SUITE).
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
-include("test_server_line.hrl").
-include("inets_test_lib.hrl").
@@ -28,25 +28,24 @@
-define(NUM_DEFAULT_SERVICES, 1).
-all(doc) ->
- ["Test suites for the inets application."];
+all() ->
+[{group, app_test}, {group, appup_test},
+ {group, services_test}, httpd_reload].
+
+groups() ->
+ [{services_test, [],
+ [start_inets, start_httpc, start_httpd, start_ftpc,
+ start_tftpd]},
+ {app_test, [], [{inets_app_test, all}]},
+ {appup_test, [], [{inets_appup_test, all}]}].
+
+init_per_group(_GroupName, Config) ->
+ Config.
+
+end_per_group(_GroupName, Config) ->
+ Config.
-all(suite) ->
- [
- app_test,
- appup_test,
- services_test,
- httpd_reload
- ].
-services_test(suite) ->
- [
- start_inets,
- start_httpc,
- start_httpd,
- start_ftpc,
- start_tftpd
- ].
%%--------------------------------------------------------------------
@@ -100,11 +99,7 @@ end_per_testcase(_, Config) ->
%%-------------------------------------------------------------------------
%% Test cases starts here.
%%-------------------------------------------------------------------------
-app_test(suite) ->
- [{inets_app_test, all}].
-appup_test(suite) ->
- [{inets_appup_test, all}].
%%-------------------------------------------------------------------------