aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-03-08 18:30:15 +0100
committerAnders Svensson <[email protected]>2013-03-17 15:07:00 +0100
commitecebd37eb5e874e307812373c072f685455a2eee (patch)
tree3f03f415f3bb987e2e3bf5c1a0706ec661d5b3bb
parentd70a02e7415caccd13fad8dda417d0d18a112a83 (diff)
downloadotp-ecebd37eb5e874e307812373c072f685455a2eee.tar.gz
otp-ecebd37eb5e874e307812373c072f685455a2eee.tar.bz2
otp-ecebd37eb5e874e307812373c072f685455a2eee.zip
Specify timeouts to ct_slave:start/2
-rw-r--r--lib/diameter/test/diameter_distribution_SUITE.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_distribution_SUITE.erl b/lib/diameter/test/diameter_distribution_SUITE.erl
index 08b0870730..01d3507b27 100644
--- a/lib/diameter/test/diameter_distribution_SUITE.erl
+++ b/lib/diameter/test/diameter_distribution_SUITE.erl
@@ -97,6 +97,11 @@
{client1, ?CLIENT},
{client2, ?CLIENT}]).
+%% Options to ct_slave:start/2.
+-define(TIMEOUTS, [{T, 15000} || T <- [boot_timeout,
+ init_timeout,
+ start_timeout]]).
+
%% ===========================================================================
suite() ->
@@ -130,7 +135,7 @@ enslave(Config) ->
[] = [{T,S} || {{_,E} = T, S} <- Nodes, E /= ok].
slave(Name, Dirs) ->
- add_pathsa(Dirs, ct_slave:start(Name)).
+ add_pathsa(Dirs, ct_slave:start(Name, ?TIMEOUTS)).
add_pathsa(Dirs, {ok, Node}) ->
{Node, rpc:call(Node, code, add_pathsa, [Dirs])};