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_examples_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_examples_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_examples_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl index aef4bc35ef..ef8e459175 100644 --- a/lib/diameter/test/diameter_examples_SUITE.erl +++ b/lib/diameter/test/diameter_examples_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2014. All Rights Reserved. +%% Copyright Ericsson AB 2013-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 @@ -295,15 +295,15 @@ slave() -> [{timetrap, {minutes, 10}}]. slave(_) -> - T0 = now(), + T0 = diameter_lib:now(), {ok, Node} = ct_slave:start(?MODULE, ?TIMEOUTS), - T1 = now(), + T1 = diameter_lib:now(), T2 = rpc:call(Node, erlang, now, []), {ok, Node} = ct_slave:stop(?MODULE), - now_diff([T0, T1, T2, now()]). + now_diff([T0, T1, T2, diameter_lib:now()]). now_diff([T1,T2|_] = Ts) -> - [timer:now_diff(T2,T1) | now_diff(tl(Ts))]; + [diameter_lib:micro_diff(T2,T1) | now_diff(tl(Ts))]; now_diff(_) -> []. @@ -397,4 +397,4 @@ stop(Name) stop(Config) -> Prot = proplists:get_value(group, Config), - [] = [RC || N <- ?NODES, RC <- [stop(concat(Prot, N))], RC /= ok]. + [] = [RC || N <- ?NODES, RC <- [catch stop(concat(Prot, N))], RC /= ok]. |