aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test/diameter_distribution_SUITE.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-04-09 15:57:19 +0200
committerAnders Svensson <[email protected]>2013-04-15 10:10:02 +0200
commit96d04d58fd91062a6e5f96fbc6cce49ee325d087 (patch)
tree1e94d8f450fa4c4a2933254d96896c173b669f70 /lib/diameter/test/diameter_distribution_SUITE.erl
parentba278bc64de031a571c8c5ea01d84287c67307db (diff)
downloadotp-96d04d58fd91062a6e5f96fbc6cce49ee325d087.tar.gz
otp-96d04d58fd91062a6e5f96fbc6cce49ee325d087.tar.bz2
otp-96d04d58fd91062a6e5f96fbc6cce49ee325d087.zip
Lighten up on suite timetraps
Due to sporadic timeouts one some (slow) hosts.
Diffstat (limited to 'lib/diameter/test/diameter_distribution_SUITE.erl')
-rw-r--r--lib/diameter/test/diameter_distribution_SUITE.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_distribution_SUITE.erl b/lib/diameter/test/diameter_distribution_SUITE.erl
index 01d3507b27..f069abbe2f 100644
--- a/lib/diameter/test/diameter_distribution_SUITE.erl
+++ b/lib/diameter/test/diameter_distribution_SUITE.erl
@@ -28,7 +28,7 @@
all/0]).
%% testcases
--export([enslave/1,
+-export([enslave/1, enslave/0,
ping/1,
start/1,
connect/1,
@@ -36,7 +36,7 @@
send_remote/1,
send_timeout/1,
send_failover/1,
- stop/1]).
+ stop/1, stop/0]).
%% diameter callbacks
-export([peer_up/3,
@@ -126,6 +126,9 @@ all() ->
%% Start four slave nodes, one to implement a Diameter server,
%% two three to implement a client.
+enslave() ->
+ [{timetrap, {seconds, 30*length(?NODES)}}].
+
enslave(Config) ->
Here = filename:dirname(code:which(?MODULE)),
Ebin = filename:join([Here, "..", "ebin"]),
@@ -225,6 +228,9 @@ connect(Config) ->
%%
%% Stop the slave nodes.
+stop() ->
+ [{timetrap, {seconds, 30*length(?NODES)}}].
+
stop(_Config) ->
[] = [{N,E} || {N,_} <- ?NODES,
{error, _, _} = E <- [ct_slave:stop(N)]].