diff options
| author | Anders Svensson <[email protected]> | 2015-08-04 23:46:29 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-08-05 10:17:19 +0200 |
| commit | 96d63dca845e18f86488db9d8dfb33eb76ad0467 (patch) | |
| tree | 5a7b1f6f5f1fd84ff21b6280c04fc8f9a3be5cd0 /lib/diameter/test/diameter_traffic_SUITE.erl | |
| parent | 9c0f2f2ce3ed040b3963d5b00cad0276c276d590 (diff) | |
| download | otp-96d63dca845e18f86488db9d8dfb33eb76ad0467.tar.gz otp-96d63dca845e18f86488db9d8dfb33eb76ad0467.tar.bz2 otp-96d63dca845e18f86488db9d8dfb33eb76ad0467.zip | |
Simplify time manipulation
By doing away with more wrapping that the parent commit started to
remove.
Diffstat (limited to 'lib/diameter/test/diameter_traffic_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_traffic_SUITE.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl index 17faf30a9b..4669fb6720 100644 --- a/lib/diameter/test/diameter_traffic_SUITE.erl +++ b/lib/diameter/test/diameter_traffic_SUITE.erl @@ -874,7 +874,7 @@ call(Config, Req, Opts) -> diameter:call(CN, dict(Req, Dict0), msg(Req, ReqEncoding, Dict0), - [{extra, [{Name, Group}, diameter_lib:now()]} | Opts]). + [{extra, [{Name, Group}, now()]} | Opts]). origin({A,C}) -> 2*codec(A) + container(C); @@ -1200,10 +1200,8 @@ app(Req, _, Dict0) -> %% handle_error/6 handle_error(timeout = Reason, _Req, [$C|_], _Peer, _, Time) -> - Now = diameter_lib:now(), - {Reason, {diameter_lib:timestamp(Time), - diameter_lib:timestamp(Now), - diameter_lib:micro_diff(Now, Time)}}; + Now = now(), + {Reason, {Time, Now, timer:now_diff(Now, Time)}}; handle_error(Reason, _Req, [$C|_], _Peer, _, _Time) -> {error, Reason}. |