diff options
| author | Anders Svensson <[email protected]> | 2015-08-13 17:08:15 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-08-13 23:01:28 +0200 |
| commit | 8c5d719afaeae0c9cfa1079c0de5452f8bdc837b (patch) | |
| tree | c886baae9730405c7dafac7549e9a1246aac686a /lib/diameter/test/diameter_gen_sctp_SUITE.erl | |
| parent | c972a98fe58569d661e9bfad5512bcdb498f6200 (diff) | |
| parent | 155c22ff3ce3f667d4a984bd6648f029e0998381 (diff) | |
| download | otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.tar.gz otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.tar.bz2 otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.zip | |
Merge branch 'maint-17' into maint
The diffs are all about adapting to the OTP 18 time interface. The code
was previously backwards compatible, falling back on the erlang:now/0 if
erlang:monotonic_time/0 is unavailable, but this was seen to be a bad
thing in commit 9c0f2f2c. Use of erlang:now/0 is now removed.
Diffstat (limited to 'lib/diameter/test/diameter_gen_sctp_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_gen_sctp_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl index c739643dbe..cbd7fc8ec5 100644 --- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl +++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl @@ -300,10 +300,10 @@ connect2(Pid, PortNr, Bin) -> %% T2 = time after listening process received our message %% T3 = time after reply is received - T1 = diameter_util:timestamp(), + T1 = diameter_lib:now(), ok = send(Sock, Id, Bin), T2 = unmark(recv(Sock, Id)), - T3 = diameter_util:timestamp(), + T3 = diameter_lib:now(), {diameter_lib:micro_diff(T2, T1), %% Outbound diameter_lib:micro_diff(T3, T2)}. %% Inbound @@ -330,13 +330,13 @@ send(Sock, Id, Bin) -> %% mark/1 mark(Bin) -> - Info = term_to_binary(diameter_util:timestamp()), + Info = term_to_binary(diameter_lib:now()), <<Info/binary, Bin/binary>>. %% unmark/1 unmark(Bin) -> - {_,_,_} = binary_to_term(Bin). + binary_to_term(Bin). %% =========================================================================== |