aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test/diameter_event_SUITE.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-02-10 08:44:35 +0100
committerAnders Svensson <[email protected]>2015-02-20 02:26:53 +0100
commiteae8ecd1fd2ba33b1c81d0c19605047e2f317eda (patch)
treec6dacca281e305e441a23b2fda3859cd5a623877 /lib/diameter/test/diameter_event_SUITE.erl
parente6d19a18b7c1057c2b4493f8db822c82bb0dbe0d (diff)
downloadotp-eae8ecd1fd2ba33b1c81d0c19605047e2f317eda.tar.gz
otp-eae8ecd1fd2ba33b1c81d0c19605047e2f317eda.tar.bz2
otp-eae8ecd1fd2ba33b1c81d0c19605047e2f317eda.zip
Use new time api in test suites
Where it's less important to do so, but it has to be done at some point since erlang:now/0 is deprecated. As in the parent commit, continue to use the old api if the new one is unavailable.
Diffstat (limited to 'lib/diameter/test/diameter_event_SUITE.erl')
-rw-r--r--lib/diameter/test/diameter_event_SUITE.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl
index f43f111d20..bfe160203c 100644
--- a/lib/diameter/test/diameter_event_SUITE.erl
+++ b/lib/diameter/test/diameter_event_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-15. 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
@@ -168,16 +168,15 @@ connect(Config, Opts) ->
{Name, Ref}.
uniq() ->
- {MS,S,US} = now(),
- lists:flatten(io_lib:format("-~p-~p-~p-", [MS,S,US])).
+ "-" ++ diameter_util:unique_string().
event(Name) ->
receive #diameter_event{service = Name, info = T} -> T end.
event(Name, TL, TH) ->
- T0 = now(),
+ T0 = diameter_lib:now(),
Event = event(Name),
- DT = timer:now_diff(now(), T0) div 1000,
+ DT = diameter_lib:micro_diff(T0) div 1000,
{true, true, DT, Event} = {TL < DT, DT < TH, DT, Event},
Event.