Merge branch 'siri/cuddle-master'

* siri/cuddle-master:
  [ct test] Catch call to ssh:start/0
  [sasl test] Do GC before measuring and comparing time
  [sasl test] Give some time and try again if nodes are not synched

2 files changed, 20 insertions, 28 deletions

diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 2919f01605..8932f930d1 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -55,7 +55,7 @@ check_crypto_and_ssh() ->
     (catch code:load_file(crypto)),
     case code:is_loaded(crypto) of
 	{file,_} ->
-	    case ssh:start() of
+	    case catch ssh:start() of
 		Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
 		    ct:log("ssh started",[]),
 		    ok;
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 8134e02221..ad58bb6b7b 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1103,6 +1103,7 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
     %% First, install release directly and check how much time it takes
+    rpc:call(Node,erlang,garbage_collect,[]),
     rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
     {TInst0,{ok, _, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
@@ -1129,6 +1130,7 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
     %% Finally install release after check and purge, and check that
     %% this install was faster than the first.
     rpc:call(Node,erlang,system_flag,[scheduler_wall_time,false]),
+    rpc:call(Node,erlang,garbage_collect,[]),
     rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
     {TInst2,{ok, _RelVsn1, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
@@ -1200,6 +1202,7 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
 		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
     %% First, install release directly and check how much time it takes
+    rpc:call(Node,erlang,garbage_collect,[]),
     rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
     {TInst0,{ok, _, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
@@ -1226,6 +1229,7 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
     %% Finally install release after check and purge, and check that
     %% this install was faster than the first.
     rpc:call(Node,erlang,system_flag,[scheduler_wall_time,false]),
+    rpc:call(Node,erlang,garbage_collect,[]),
     rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
     {TInst2,{ok, _RelVsn1, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
@@ -1761,8 +1765,6 @@ upgrade_gg(Conf) ->
     Nodes1 = [Gg1,Gg3,Gg4,Gg5] =
 	start_nodes(Conf,[Gg1Sname,Gg3Sname,Gg4Sname,Gg5Sname],"upgrade_gg"),
 
-    %% Give some time to synch nodes, then check global group info.
-    timer:sleep(1000),
     [check_gg_info(Node,Nodes1,[],Nodes1--[Node]) || Node <- Nodes1],
 
     %% register a process on each of the nodes
@@ -2449,37 +2451,27 @@ write_term_file(File,Term) ->
     ok = file:write_file(File,io_lib:format("~p.~n",[Term])).
     
 
-%% Check that global group info is correct
+%% Check that global group info is correct - try again for a maximum of 5 sec
 check_gg_info(Node,OtherAlive,OtherDead,Synced) ->
+    check_gg_info(Node,OtherAlive,OtherDead,Synced,5).
+
+check_gg_info(Node,OtherAlive,OtherDead,Synced,N) ->
     GGI = rpc:call(Node, global_group, info, []),
     GI = rpc:call(Node, global, info,[]),
     try do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) 
-    catch _:E ->
-	    ?t:format("~ncheck_gg_info failed for ~p: ~p~nwhen GGI was: ~p~n"
-		      "and GI was: ~p~n",
-		      [Node,E,GGI,GI]),
-	    %% An attempt to find out if it is only a timing issue
-	    %% that makes this fail every now and then:
-	    try_again_check(Node,GGI,GI,1),
-	    ?t:fail("check_gg_info failed")
-    end.
-
-try_again_check(_Node,_GGI,_GI,6) ->
-    ok;
-try_again_check(Node,GGI,GI,N) ->
-    timer:sleep(1000),
-    case {rpc:call(Node,global_group,info,[]),
-	  rpc:call(Node,global,info,[])} of
-	{GGI,GI} ->
-	    ?t:format("~nAfter one more sek, GGI and GI are still the same"),
-	    try_again_check(Node,GGI,GI,N+1);
-	{NewGGI,NewGI} ->
-	    ?t:format("~nAfter one more sek:~nNew GGI: ~p~nNew GI: ~p~n",
-		      [NewGGI,NewGI]),
-	    try_again_check(Node,NewGGI,NewGI,N+1)
+    catch _:E when N==0 ->
+	    ?t:format("~nERROR: check_gg_info failed for ~p:~n~p~n"
+		      "when GGI was: ~p~nand GI was: ~p~n",
+		      [Node,{E,erlang:get_stacktrace()},GGI,GI]),
+	    ?t:fail("check_gg_info failed");
+	  _:E ->
+	    ?t:format("~nWARNING: check_gg_info failed for ~p:~n~p~n"
+		      "when GGI was: ~p~nand GI was: ~p~n",
+		      [Node,{E,erlang:get_stacktrace()},GGI,GI]),
+	    timer:sleep(1000),
+	    check_gg_info(Node,OtherAlive,OtherDead,Synced,N-1)
     end.
 
-
 do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) ->
     {_,gg1} = lists:keyfind(own_group_name,1,GGI),
     {_,synced} = lists:keyfind(state,1,GGI),