aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-10-17 13:54:53 +0200
committerSiri Hansen <[email protected]>2012-10-30 11:18:41 +0100
commitf617b5b1f310dd37d606f3648246cc0851e12bef (patch)
tree175ef0cf9028280b9e95cc6f18389ca4a941bad0 /lib/test_server/src
parent2794f452c8197a9c242c7e3652481f4f4d6e3422 (diff)
downloadotp-f617b5b1f310dd37d606f3648246cc0851e12bef.tar.gz
otp-f617b5b1f310dd37d606f3648246cc0851e12bef.tar.bz2
otp-f617b5b1f310dd37d606f3648246cc0851e12bef.zip
[test_server] Start cover in test_server:wait_for_node
Without this change, there is no support in test_server for starting cover on a node started with option {wait,false}.
Diffstat (limited to 'lib/test_server/src')
-rw-r--r--lib/test_server/src/test_server.erl25
1 files changed, 24 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index fc8fe1a9ce..330c4cc8a9 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -2612,7 +2612,30 @@ wait_for_node(Slave) ->
group_leader() ! {sync_apply,
self(),
{test_server_ctrl,wait_for_node,[Slave]}},
- receive {sync_result,R} -> R end.
+ Result = receive {sync_result,R} -> R end,
+ case Result of
+ ok ->
+ Cover = case is_cover() of
+ true ->
+ not is_shielded(Slave) andalso same_version(Slave);
+ false ->
+ false
+ end,
+
+ net_adm:ping(Slave),
+ case Cover of
+ true ->
+ MainCoverNode = cover:get_main_node(),
+ Sticky = unstick_all_sticky(MainCoverNode,Slave),
+ rpc:call(MainCoverNode,cover,start,[Slave]),
+ stick_all_sticky(Slave,Sticky);
+ _ ->
+ ok
+ end;
+ _ ->
+ ok
+ end,
+ Result.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%