diff options
| author | Anders Svensson <[email protected]> | 2015-02-10 08:44:35 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-02-20 02:26:53 +0100 |
| commit | eae8ecd1fd2ba33b1c81d0c19605047e2f317eda (patch) | |
| tree | c6dacca281e305e441a23b2fda3859cd5a623877 /lib/diameter/test/diameter_traffic_SUITE.erl | |
| parent | e6d19a18b7c1057c2b4493f8db822c82bb0dbe0d (diff) | |
| download | otp-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_traffic_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_traffic_SUITE.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl index 4b67372016..318057b1b2 100644 --- a/lib/diameter/test/diameter_traffic_SUITE.erl +++ b/lib/diameter/test/diameter_traffic_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2014. All Rights Reserved. +%% Copyright Ericsson AB 2010-2015. 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 @@ -759,7 +759,7 @@ call(Config, Req, Opts) -> diameter:call(?CLIENT, dict(Req, Dict0), msg(Req, ReqEncoding, Dict0), - [{extra, [{Name, Group}, now()]} | Opts]). + [{extra, [{Name, Group}, diameter_lib:now()]} | Opts]). origin({A,C}) -> 2*codec(A) + container(C); @@ -1078,8 +1078,10 @@ app(Req, _, Dict0) -> %% handle_error/6 handle_error(timeout = Reason, _Req, ?CLIENT, _Peer, _, Time) -> - Now = now(), - {Reason, {Time, Now, timer:now_diff(Now, Time)}}; + Now = diameter_lib:now(), + {Reason, {diameter_lib:timestamp(Time), + diameter_lib:timestamp(Now), + diameter_lib:micro_diff(Now, Time)}}; handle_error(Reason, _Req, ?CLIENT, _Peer, _, _Time) -> {error, Reason}. |