Merge branch 'siri/master-cuddle-with-tests'

* siri/master-cuddle-with-tests:
  Stop nodes after test cases in release_handler_SUITE
  Add debug printouts in release_handler_SUITE:upgrade_gg
  Improve printout of command when encoding is utf-8
  Add debug printouts in crashdump_viewer_SUITE:load_file

2 files changed, 44 insertions, 2 deletions

diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index f6e7d18f65..e9567c82cb 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -301,10 +301,12 @@ wait_for_progress_done() ->
 %%%-----------------------------------------------------------------
 %%% General check of what is displayed for a dump
 browse_file(File) ->
-    io:format("Browsing file: ~s~n",[File]),
+    io:format("~nBrowsing file: ~s",[File]),
 
     ok = start_backend(File),
 
+    io:format("  backend started",[]),
+
     {ok,_GI=#general_info{},_GenTW} = crashdump_viewer:general_info(),
     {ok,Procs,_ProcsTW} = crashdump_viewer:processes(),
     {ok,Ports,_PortsTW} = crashdump_viewer:ports(),
@@ -321,10 +323,16 @@ browse_file(File) ->
     {ok,_HashTabs,_HashTabsTW} = crashdump_viewer:hash_tables(),
     {ok,_IndexTabs,_IndexTabsTW} = crashdump_viewer:index_tables(),
 
+    io:format("  info read",[]),
+
     lookat_all_pids(Procs),
+    io:format("  pids ok",[]),
     lookat_all_ports(Ports),
+    io:format("  ports ok",[]),
     lookat_all_mods(Mods),
+    io:format("  mods ok",[]),
     lookat_all_nodes(Nodes),
+    io:format("  nodes ok",[]),
 
     Procs. % used as second arg to special/2
 
@@ -339,6 +347,7 @@ special(File,Procs) ->
 	    [#proc{pid=Pid0}|_Rest] = lists:keysort(#proc.name,Procs),
 	    Pid = pid_to_list(Pid0),
 	    {ok,ProcDetails=#proc{},[]} = crashdump_viewer:proc_details(Pid),
+	    io:format("  process details ok",[]),
 
 	    #proc{dict=Dict} = ProcDetails,
 
@@ -350,6 +359,7 @@ special(File,Procs) ->
 	    ['#CDVBin',SOffset,SSize,SPos] = proplists:get_value(sub_bin,Dict),
 	    {ok,<<_:SSize/binary>>} =
 		crashdump_viewer:expand_binary({SOffset,SSize,SPos}),
+	    io:format("  expand binary ok",[]),
 
 	    ['#CDVPid',X1,Y1,Z1] = proplists:get_value(ext_pid,Dict),
 	    ChannelStr1 = integer_to_list(X1),
@@ -359,22 +369,28 @@ special(File,Procs) ->
 		integer_to_list(Z1) ++ ">",
 	    {error,{other_node,ChannelStr1}} =
 		crashdump_viewer:proc_details(ExtPid),
+	    io:format("  process details external ok",[]),
 
 	    ['#CDVPort',X2,Y2] = proplists:get_value(port,Dict),
 	    ChannelStr2 = integer_to_list(X2),
 	    Port = "#Port<"++ChannelStr2++"."++integer_to_list(Y2)++">",
 	    {ok,_PortDetails=#port{},[]} = crashdump_viewer:port(Port),
+	    io:format("  port details ok",[]),
 
 	    ['#CDVPort',X3,Y3] = proplists:get_value(ext_port,Dict),
 	    ChannelStr3 = integer_to_list(X3),
 	    ExtPort = "#Port<"++ChannelStr3++"."++integer_to_list(Y3)++">",
 	    {error,{other_node,ChannelStr3}} = crashdump_viewer:port(ExtPort),
+	    io:format("  port details external ok",[]),
 
 	    {ok,[_Ets=#ets_table{}],[]} = crashdump_viewer:ets_tables(Pid),
+	    io:format("  ets tables ok",[]),
 	    {ok,[_Timer=#timer{}],[]} = crashdump_viewer:timers(Pid),
+	    io:format("  timers ok",[]),
 
 	    {ok,Mod1=#loaded_mod{},[]} =
 		crashdump_viewer:loaded_mod_details(atom_to_list(?helper_mod)),
+	    io:format("  modules ok",[]),
 	    #loaded_mod{current_size=CS, old_size=OS,
 			old_attrib=A,old_comp_info=C}=Mod1,
 	    true = is_integer(CS),
@@ -383,6 +399,7 @@ special(File,Procs) ->
 	    true = (C=/=undefined),
 	    {ok,Mod2=#loaded_mod{},[]} =
 		crashdump_viewer:loaded_mod_details("application"),
+	    io:format("  module details ok",[]),
 	    #loaded_mod{old_size="No old code exists",
 			old_attrib=undefined,
 			old_comp_info=undefined}=Mod2,
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index ad2a8005b9..1d8bf45289 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -667,6 +667,9 @@ release_handler_which_releases(Conf) ->
 
     ok.
 
+release_handler_which_releases(cleanup,_Conf) ->
+    stop_node(node_name(release_handler_which_releases)).
+
 %%-----------------------------------------------------------------
 %% Ticket: OTP-2740
 %% Slogan: vsn not numeric doesn't work so good in release_handling
@@ -1365,6 +1368,9 @@ upgrade_supervisor(Conf) when is_list(Conf) ->
 
     ok.
 
+upgrade_supervisor(cleanup,_Condf) ->
+    stop_node(node_name(upgrade_supervisor)).
+
 %% Check that if the supervisor fails, then the upgrade is rolled back
 %% and an ok error message is returned
 upgrade_supervisor_fail(Conf) when is_list(Conf) ->
@@ -2417,9 +2423,28 @@ check_gg_info(Node,OtherAlive,OtherDead,Synced) ->
 	    ?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)
+    end.
+
+
 do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) ->
     {_,gg1} = lists:keyfind(own_group_name,1,GGI),
     {_,synced} = lists:keyfind(state,1,GGI),
@@ -2563,7 +2588,7 @@ start_nodes(Conf,Snames,Tag) ->
     
 start_node_unix(Sname,NodeDir) ->
     Script = filename:join([NodeDir,"bin","start"]),
-    ?t:format("Starting ~p: ~tp~n", [Sname,Script]),
+    ?t:format("Starting ~p: ~ts~n", [Sname,Script]),
     case rh_test_lib:cmd(Script,[],[{"NODENAME",atom_to_list(Sname)}]) of
 	ok ->
 	    {ok,node_name(Sname)};