diff options
author | Micael Karlberg <[email protected]> | 2019-07-10 19:03:04 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2019-07-17 11:47:49 +0200 |
commit | b4730a1efd315d7b4e410f34a2b66cb7bfd77889 (patch) | |
tree | eb7e3bd61e08c98b2577623db20a0640ffe87bf4 /lib/megaco/test/megaco_tcp_test.erl | |
parent | 4f377cd09e0e313bc2fe03c003db7f652934c618 (diff) | |
download | otp-b4730a1efd315d7b4e410f34a2b66cb7bfd77889.tar.gz otp-b4730a1efd315d7b4e410f34a2b66cb7bfd77889.tar.bz2 otp-b4730a1efd315d7b4e410f34a2b66cb7bfd77889.zip |
[megaco|test] erlang:now() and random cleanup
Removed all use of erlang:now() and the deprecated random module
from the test suite.
Diffstat (limited to 'lib/megaco/test/megaco_tcp_test.erl')
-rw-r--r-- | lib/megaco/test/megaco_tcp_test.erl | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/lib/megaco/test/megaco_tcp_test.erl b/lib/megaco/test/megaco_tcp_test.erl index a1865ad690..1f09db265d 100644 --- a/lib/megaco/test/megaco_tcp_test.erl +++ b/lib/megaco/test/megaco_tcp_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2016. All Rights Reserved. +%% Copyright Ericsson AB 2000-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1214,23 +1214,14 @@ p(F, A) -> p(S, F, A) when is_list(S) -> io:format("*** [~s] ~p ~s ***" "~n " ++ F ++ "~n", - [format_timestamp(now()), self(), S | A]); + [?FTS(), self(), S | A]); p(_S, F, A) -> io:format("*** [~s] ~p ~s *** " "~n " ++ F ++ "~n", - [format_timestamp(now()), self(), "undefined" | A]). + [?FTS(), self(), "undefined" | A]). ms() -> - {A,B,C} = erlang:now(), - A*1000000000+B*1000+(C div 1000). - + erlang:monotonic_time(milli_seconds). + -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). |