diff options
| author | Peter Andersson <[email protected]> | 2015-03-11 09:41:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-20 15:28:54 +0100 |
| commit | a219c06f31e082449a1e001c051661370fa00a5d (patch) | |
| tree | 0b99ba0aabbee1d970ffe48b7fe599b536382d1e /lib/common_test/test/telnet_server.erl | |
| parent | d2c19c15b887d44b92fa36c5f49d7f2ff755f8ad (diff) | |
| download | otp-a219c06f31e082449a1e001c051661370fa00a5d.tar.gz otp-a219c06f31e082449a1e001c051661370fa00a5d.tar.bz2 otp-a219c06f31e082449a1e001c051661370fa00a5d.zip | |
Replace all calls to now/0 in CT with new time API functions
Diffstat (limited to 'lib/common_test/test/telnet_server.erl')
| -rw-r--r-- | lib/common_test/test/telnet_server.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl index d25ee62d38..40a02ded65 100644 --- a/lib/common_test/test/telnet_server.erl +++ b/lib/common_test/test/telnet_server.erl @@ -284,10 +284,10 @@ send(Data,State) -> send_loop(T,Data,State) -> dbg("Server sending ~p in loop for ~w ms...~n",[Data,T]), - send_loop(now(),T,Data,State). + send_loop(os:timestamp(),T,Data,State). send_loop(T0,T,Data,State) -> - ElapsedMS = trunc(timer:now_diff(now(),T0)/1000), + ElapsedMS = trunc(timer:now_diff(os:timestamp(),T0)/1000), if ElapsedMS >= T -> ok; true -> @@ -314,7 +314,7 @@ dbg(_F,_A) -> io:format("[telnet_server, ~s]\n" ++ _F,[TS|_A]). timestamp() -> - {MS,S,US} = now(), + {MS,S,US} = os:timestamp(), {{Year,Month,Day}, {Hour,Min,Sec}} = calendar:now_to_local_time({MS,S,US}), MilliSec = trunc(US/1000), |