diff options
| author | Anders Svensson <[email protected]> | 2015-03-05 01:34:41 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-05 01:34:41 +0100 |
| commit | ac82610a03c8b17b6bcae91aa4252a1930c51e85 (patch) | |
| tree | 23c9bd58e6792ed656af6889cafbda8805377b55 /lib/diameter/test/diameter_traffic_SUITE.erl | |
| parent | 2456cf80733d3ee5d1c0dca3c52366166d8ad2b6 (diff) | |
| parent | 71b52f31772210a7160317966ca46e36140b935a (diff) | |
| download | otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.tar.gz otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.tar.bz2 otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.zip | |
Merge branch 'maint'
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 03815f283e..9822b95301 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 @@ -760,7 +760,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); @@ -1076,8 +1076,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}. |