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_ct.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_ct.erl')
| -rw-r--r-- | lib/diameter/test/diameter_ct.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl index ed2f884681..85c502ea7f 100644 --- a/lib/diameter/test/diameter_ct.erl +++ b/lib/diameter/test/diameter_ct.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. 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 @@ -43,7 +43,7 @@ ct_run(Opts) -> info(Start , info()). info() -> - [{time, now()}, + [{time, diameter_lib:now()}, {process_count, erlang:system_info(process_count)} | erlang:memory()]. @@ -56,6 +56,6 @@ info(L0, L1) -> io:format("INFO: ~p~n", [Diff]). diff(time, T0, T1) -> - timer:now_diff(T1, T0); + diameter_lib:micro_diff(T1, T0); diff(_, N0, N1) -> N1 - N0. |