aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/test/megaco_test_generator.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-10 19:03:04 +0200
committerMicael Karlberg <[email protected]>2019-07-17 11:47:49 +0200
commitb4730a1efd315d7b4e410f34a2b66cb7bfd77889 (patch)
treeeb7e3bd61e08c98b2577623db20a0640ffe87bf4 /lib/megaco/test/megaco_test_generator.erl
parent4f377cd09e0e313bc2fe03c003db7f652934c618 (diff)
downloadotp-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_test_generator.erl')
-rw-r--r--lib/megaco/test/megaco_test_generator.erl18
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/megaco/test/megaco_test_generator.erl b/lib/megaco/test/megaco_test_generator.erl
index 63f66bda07..f922afa37d 100644
--- a/lib/megaco/test/megaco_test_generator.erl
+++ b/lib/megaco/test/megaco_test_generator.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-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.
@@ -65,6 +65,7 @@
-include_lib("megaco/include/megaco.hrl").
+-include("megaco_test_lib.hrl").
%%----------------------------------------------------------------------
@@ -533,22 +534,13 @@ print(P, F, A) ->
print([], undefined, F, A) ->
io:format("*** [~s] ~p *** " ++
"~n " ++ F ++ "~n",
- [format_timestamp(now()),self()|A]);
+ [?FTS(), self() | A]);
print(P, undefined, F, A) ->
io:format("*** [~s] ~p ~s *** " ++
"~n " ++ F ++ "~n",
- [format_timestamp(now()),self(),P|A]);
+ [?FTS(), self(), P | A]);
print(P, N, F, A) ->
io:format("*** [~s] ~p ~s~s *** " ++
"~n " ++ F ++ "~n",
- [format_timestamp(now()),self(),N,P|A]).
+ [?FTS(), self(), N, P | A]).
-
-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).