diff options
| author | Erlang/OTP <[email protected]> | 2015-08-13 12:34:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-08-13 12:34:03 +0200 |
| commit | 2c7132e3f6dc670a177aac804fe12702dbc9ed7d (patch) | |
| tree | f684c2a7881b2fb3eb44312df3770432de01b86d /lib/diameter/test/diameter_gen_sctp_SUITE.erl | |
| parent | 0c21fb612b736f53dcc04face42bd106c50287ae (diff) | |
| parent | 96d63dca845e18f86488db9d8dfb33eb76ad0467 (diff) | |
| download | otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.tar.gz otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.tar.bz2 otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.zip | |
Merge branch 'anders/diameter/17/time/OTP-12926' into maint-17
* anders/diameter/17/time/OTP-12926:
Simplify time manipulation
Remove use of monotonic time in pre-18 code
Remove unnecessary redefinition of erlang:max/2
Diffstat (limited to 'lib/diameter/test/diameter_gen_sctp_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_gen_sctp_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl index 4ea5e80095..ced897c714 100644 --- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl +++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl @@ -296,12 +296,12 @@ connect2(Pid, PortNr, Bin) -> %% T2 = time after listening process received our message %% T3 = time after reply is received - T1 = diameter_util:timestamp(), + T1 = now(), ok = send(Sock, Id, Bin), T2 = unmark(recv(Sock, Id)), - T3 = diameter_util:timestamp(), - {diameter_lib:micro_diff(T2, T1), %% Outbound - diameter_lib:micro_diff(T3, T2)}. %% Inbound + T3 = now(), + {timer:now_diff(T2, T1), %% Outbound + timer:now_diff(T3, T2)}. %% Inbound %% recv/2 @@ -326,7 +326,7 @@ send(Sock, Id, Bin) -> %% mark/1 mark(Bin) -> - Info = term_to_binary(diameter_util:timestamp()), + Info = term_to_binary(now()), <<Info/binary, Bin/binary>>. %% unmark/1 |