2 files changed, 32 insertions, 11 deletions

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index ec61c57cec..80807b1d38 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -516,13 +516,11 @@ reconnect(Config) ->
     cover:flush(N1),
     rpc:call(N1,f,f1,[]),
 
-    %% This will cause a call to f:f2() when nodes()==[] on N1
+    %% This will cause first casue the N1 node to initiate a
+    %% disconnect and then call f:f2() when nodes() =:= [] on N1.
     rpc:cast(N1,f,call_f2_when_isolated,[]),
-
-    %% Disconnect and check that node is removed from main cover node
-    net_kernel:disconnect(N1),
     timer:sleep(500), % allow some to detect disconnect and for f:f2() call
-    [] = cover:which_nodes(),
+    cover_which_nodes([]),
 
     %% Do some add one module (b) and remove one module (a)
     code:purge(a),
@@ -530,7 +528,7 @@ reconnect(Config) ->
     {ok,b} = cover:compile(b),
     cover_compiled = code:which(b),
 
-    [] = cover:which_nodes(),
+    cover_which_nodes([]),
     check_f_calls(1,0), % only the first call - before the flush
 
     %% Reconnect the node and check that b and f are cover compiled but not a
@@ -573,7 +571,7 @@ die_and_reconnect(Config) ->
 
     %% Kill the node
     rpc:call(N1,erlang,halt,[]),
-    [] = cover:which_nodes(),
+    cover_which_nodes([]),
 
     check_f_calls(1,0), % only the first call - before the flush
 
@@ -614,7 +612,7 @@ dont_reconnect_after_stop(Config) ->
     %% Stop cover on the node, then terminate the node
     cover:stop(N1),
     rpc:call(N1,erlang,halt,[]),
-    [] = cover:which_nodes(),
+    cover_which_nodes([]),
 
     check_f_calls(1,0),
 
@@ -622,7 +620,7 @@ dont_reconnect_after_stop(Config) ->
     {ok,N1} = ?t:start_node(NodeName,peer,
 			    [{args," -pa " ++ DataDir},{start_cover,false}]),
     timer:sleep(300),
-    [] = cover:which_nodes(),
+    cover_which_nodes([]),
     Beam = rpc:call(N1,code,which,[f]),
     false = (Beam==cover_compiled),
 
@@ -667,7 +665,7 @@ stop_node_after_disconnect(Config) ->
     {ok,N1} = ?t:start_node(NodeName,peer,
 			    [{args," -pa " ++ DataDir},{start_cover,false}]),
     timer:sleep(300),
-    [] = cover:which_nodes(),
+    cover_which_nodes([]),
     Beam = rpc:call(N1,code,which,[f]),
     false = (Beam==cover_compiled),
 
@@ -1575,3 +1573,21 @@ is_unloaded(What) ->
 
 check_f_calls(F1,F2) ->
     {ok,[{{f,f1,0},F1},{{f,f2,0},F2}|_]} = cover:analyse(f,calls,function).
+
+cover_which_nodes(Expected) ->
+    case cover:which_nodes() of
+	Expected ->
+	    ok;
+	Other ->
+	    {Time,ok} = timer:tc(fun Retry() ->
+					 case cover:which_nodes() of
+					     Expected -> ok;
+					     _ ->
+						 ?t:sleep(100),
+						 Retry()
+					 end
+				 end),
+	    io:format("~p ms before cover:which_nodes() returned ~p",
+		      [Time,Expected]),
+	    Expected = Other
+    end.
diff --git a/lib/tools/test/cover_SUITE_data/f.erl b/lib/tools/test/cover_SUITE_data/f.erl
index ce2963014a..a29a67b388 100644
--- a/lib/tools/test/cover_SUITE_data/f.erl
+++ b/lib/tools/test/cover_SUITE_data/f.erl
@@ -10,10 +10,15 @@ f2() ->
     f2_line2.
 
 call_f2_when_isolated() ->
+    [Other] = nodes(),
+    net_kernel:disconnect(Other),
+    do_call_f2_when_isolated().
+
+do_call_f2_when_isolated() ->
     case nodes() of
 	[] ->
 	    f2();
 	_ ->
 	    timer:sleep(100),
-	    call_f2_when_isolated()
+	    do_call_f2_when_isolated()
     end.