4 files changed, 16 insertions, 61 deletions

diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 348c75f787..79e2fbca62 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -1889,7 +1889,7 @@ wait4clients(Clients, Timeout) when Timeout > 0 ->
 	{'DOWN', _MRef, process, Pid, normal} ->
 	    {value, {Id, _, _}} = lists:keysearch(Pid, 2, Clients),
 	    NewClients = lists:keydelete(Id, 1, Clients),
-	    wait4clients(NewClients, Timeout - millisec_passed(Time));
+	    wait4clients(NewClients, Timeout - inets_lib:millisec_passed(Time));
 	{'DOWN', _MRef, process, Pid, Reason} ->
 	    {value, {Id, _, _}} = lists:keysearch(Pid, 2, Clients),
 	    ct:fail({bad_client_termination, Id, Reason})
@@ -1982,17 +1982,6 @@ parse_connection_type(Request) ->
 	"keep-alive" -> keep_alive
     end.
 
-%% Help function, elapsed milliseconds since T0
-millisec_passed({_,_,_} = T0 ) ->
-    %% OTP 17 and earlier
-    timer:now_diff(erlang:now(), T0) div 1000;
-
-millisec_passed(T0) ->
-    %% OTP 18
-    erlang:convert_time_resolution(erlang:monotonic_time() - T0,
-                                   erlang:time_resolution(),
-                                   1000000) div 1000.
-
 set_random_seed() ->
     %% Adapt to OTP 18 erlang time API and be backwards compatible
     Unique = try
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index b2a2075520..b3e6746a01 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -117,7 +117,16 @@ main(N, SocketType, Host, Port, Time)
 loop(Pollers, Timeout) ->
     d("loop -> entry when"
       "~n   Timeout: ~p", [Timeout]),
-    Start = t(), 
+    %% Adapt to OTP 18 erlang time API and be backwards compatible
+    Start = try
+                erlang:monotonic_time(1000)
+            catch
+                error:undef ->
+                    %% Use Erlang system time as monotonic time
+                    {A,B,C} = erlang:now(),
+                    A*1000000000+B*1000+(C div 1000)
+            end,
+
     receive 
 	{'EXIT', Pid, {poller_stat_failure, SocketType, Host, Port, Time, Reason}} ->
 	    case is_poller(Pid, Pollers) of
@@ -134,7 +143,7 @@ loop(Pollers, Timeout) ->
 		false ->
 		    error_msg("received unexpected ~p from ~p"
 			      "befor completion of test", [Reason, Pid]),
-		    loop(Pollers, to(Timeout, Start))
+		    loop(Pollers, Timeout - inets_lib:millisec_passed(Start))
 	    end;
 
 	{poller_stat_failure, Pid, {SocketType, Host, Port, Time, Reason}} ->
@@ -477,24 +486,6 @@ status_to_message(Code) -> io_lib:format("Unknown status code: ~p",[Code]).
 
 %% ----------------------------------------------------------------
 
-to(To, Start) ->
-    To - (t() - Start).
-
-%% Time in milli seconds
-t() ->
-    %% Adapt to OTP 18 erlang time API and be backwards compatible
-    try
-        erlang:monotonic_time(1000)
-    catch
-        error:undef ->
-            %% Use Erlang system time as monotonic time
-            {A,B,C} = erlang:now(),
-            A*1000000000+B*1000+(C div 1000)
-    end.
-
-
-%% ----------------------------------------------------------------
-
 
 
 % close(Socket) ->
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 6510c70d08..a07dc79c02 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -549,25 +549,12 @@ tsf(Reason) ->
 tsp(F) ->
     tsp(F, []).
 tsp(F, A) ->
-    Timestamp = formated_timestamp(), 
+    Timestamp = inets_lib:formated_timestamp(),
     test_server:format("** ~s ** ~p ~p:" ++ F ++ "~n", [Timestamp, self(), ?MODULE | A]).
 
 i(F) ->
     i(F, []).
 
 i(F, A) ->
-    Timestamp = formated_timestamp(), 
+    Timestamp = inets_lib:formated_timestamp(),
     io:format("*** ~s ~w:" ++ F ++ "~n", [Timestamp, ?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).
-
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index aa2e3fdbbd..7485971d3e 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -539,7 +539,7 @@ flush() ->
 tsp(F) ->
     tsp(F, []).
 tsp(F, A) ->
-    Timestamp = formated_timestamp(), 
+    Timestamp = inets_lib:formated_timestamp(),
     ct:pal("*** ~s ~p ~p " ++ F ++ "~n", 
 		       [Timestamp, node(), self() | A]).
 
@@ -552,18 +552,6 @@ tss(Time) ->
 timestamp() ->
     http_util:timestamp().
 
-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).
-
 start_apps(Apps) ->
     lists:foreach(fun(App) ->
 			  application:stop(App),