aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-04-16 11:30:40 +0200
committerSiri Hansen <[email protected]>2013-04-19 10:57:13 +0200
commit61ed085d5015e3e2eb387567cd6c5d188a351ff0 (patch)
tree9ad09f4d0ca206a133bf84dc34666c42eadbe82e
parentd5b8652679a978afbadce9982442e605a3162790 (diff)
downloadotp-61ed085d5015e3e2eb387567cd6c5d188a351ff0.tar.gz
otp-61ed085d5015e3e2eb387567cd6c5d188a351ff0.tar.bz2
otp-61ed085d5015e3e2eb387567cd6c5d188a351ff0.zip
[common_test] Extend timer in cover_SUITE for slow test host
-rw-r--r--lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
index 8142bf14dc..83d368c53d 100644
--- a/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
+++ b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
@@ -91,7 +91,7 @@ slave_start_slave(_Config) ->
{ok,Node} = start_slave(N1),
cover_compiled = rpc:call(Node,code,which,[cover_test_mod]),
rpc:call(Node,cover_test_mod,foo,[]),
- {ok,Node2} = rpc:call(Node,ct_slave,start,[N2]),
+ {ok,Node2} = start_slave(Node,N2), % start slave N2 from node Node
rpc:call(Node2,cover_test_mod,foo,[]),
{ok,Node2} = rpc:call(Node,ct_slave,stop,[N2]),
{ok,Node} = ct_slave:stop(N1),
@@ -154,9 +154,13 @@ kill_slaves([]) ->
ok.
start_slave(Name) ->
+ start_slave(node(),Name).
+
+start_slave(FromNode,Name) ->
{ok, HostStr}=inet:gethostname(),
Host = list_to_atom(HostStr),
- ct_slave:start(Host,Name,
- [{boot_timeout,10}, % extending some timers for slow test hosts
- {init_timeout,10},
- {startup_timeout,10}]).
+ rpc:call(FromNode,ct_slave,start,
+ [Host,Name,
+ [{boot_timeout,15}, % extending some timers for slow test hosts
+ {init_timeout,15},
+ {startup_timeout,15}]]).