1 files changed, 32 insertions, 28 deletions
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 581c9c5782..4cd38f2ec4 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -19,24 +19,32 @@
 %%
 -module(httpd_basic_SUITE).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
 -define(URL_START, "http://localhost:").
 
-all(doc) ->
-    ["Basic test of httpd."];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(suite) ->
+all() -> 
     [
-     uri_too_long_414,
-     header_too_long_413,
+     uri_too_long_414, 
+     header_too_long_413, 
      escaped_url_in_error_body
     ].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
@@ -47,6 +55,8 @@ all(suite) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    tsp("init_per_suite -> entry with"
+	"~n   Config: ~p", [Config]),
     ok = inets:start(),
     PrivDir = ?config(priv_dir, Config),
 
@@ -80,6 +90,8 @@ DUMMY
 %% Description: Cleanup after the whole suite
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
+    tsp("end_per_suite -> entry with"
+	"~n   Config: ~p", [_Config]),
     inets:stop(),
     ok.
 
@@ -95,9 +107,12 @@ end_per_suite(_Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
+init_per_testcase(Case, Config) ->
+    tsp("init_per_testcase(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
     Config.
 
+
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
 %% Case - atom()
@@ -106,9 +121,12 @@ init_per_testcase(_Case, Config) ->
 %%   A list of key/value pairs, holding the test case configuration.
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
-end_per_testcase(_, Config) ->
+end_per_testcase(Case, Config) ->
+    tsp("end_per_testcase(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
     Config.
 
+
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
@@ -252,28 +270,14 @@ find_URL_path(["URL", URL | _]) ->
 find_URL_path([_ | Rest]) ->
     find_URL_path(Rest).
 
-tsf(Reason) ->
-    test_server:fail(Reason).
-
 
 tsp(F) ->
-    tsp(F, []).
+    inets_test_lib:tsp(F).
 tsp(F, A) ->
-    Timestamp = formated_timestamp(), 
-    test_server:format("** ~s ** ~p ~p:" ++ F ++ "~n", 
-		       [Timestamp, self(), ?MODULE | A]).
-
-formated_timestamp() ->
-    format_timestamp( os:timestamp() ).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+    inets_test_lib:tsp(F, A).
+
+tsf(Reason) ->
+    test_server:fail(Reason).
 
 
 skip(Reason) ->