diff options
| author | Anders Svensson <[email protected]> | 2015-03-05 01:34:08 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-05 01:34:08 +0100 |
| commit | 5e5b22215e3f0a60b7afc2393b3ef68892360b07 (patch) | |
| tree | 1c0a2c3b66c6af9eae4ba6587b911681a075ae64 /lib/diameter/test/diameter_event_SUITE.erl | |
| parent | a4df8f2e68ccef9936c5b43378a006099d81f801 (diff) | |
| parent | eae8ecd1fd2ba33b1c81d0c19605047e2f317eda (diff) | |
| download | otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.gz otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.bz2 otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.zip | |
Merge branch 'anders/diameter/time/OTP-12439' into maint
* anders/diameter/time/OTP-12439:
Use new time api in test suites
Use new time api in implementation
Diffstat (limited to 'lib/diameter/test/diameter_event_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_event_SUITE.erl | 9 |
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. |