From f51d3ce81c1314d06b76975d9d06bf2b22925a89 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Tue, 18 Mar 2014 09:09:20 +0100
Subject: Improve crashdump_viewer_SUITE:start_stop test case

Instead of setting a timer and expecting all processes to be
terminated, set a monitor and wait for them to terminate.
---
 lib/observer/test/crashdump_viewer_SUITE.erl | 68 +++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 16 deletions(-)

(limited to 'lib/observer/test')

diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 91f349b6c1..f6e7d18f65 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -120,27 +120,63 @@ start_stop(Config) when is_list(Config) ->
     Dump = hd(?config(dumps,Config)),
     timer:sleep(1000),
 
-    ProcsBefore = length(processes()),
+    ProcsBefore = processes(),
+    NumProcsBefore = length(ProcsBefore),
     ok = crashdump_viewer:start(Dump),
-    true = is_pid(whereis(crashdump_viewer_server)),
-    true = is_pid(whereis(cdv_wx)),
-    true = is_pid(whereis(cdv_proc_cb)),
-    true = is_pid(whereis(cdv_port_cb)),
-    true = is_pid(whereis(cdv_ets_cb)),
-    true = is_pid(whereis(cdv_timer_cb)),
-    true = is_pid(whereis(cdv_fun_cb)),
-    true = is_pid(whereis(cdv_atom_cb)),
-    true = is_pid(whereis(cdv_dist_cb)),
-    true = is_pid(whereis(cdv_mod_cb)),
+    ExpectedRegistered = [crashdump_viewer_server,
+			  cdv_wx,
+			  cdv_proc_cb,
+			  cdv_proc_cb__holder,
+			  cdv_port_cb,
+			  cdv_port_cb__holder,
+			  cdv_ets_cb,
+			  cdv_ets_cb__holder,
+			  cdv_timer_cb,
+			  cdv_timer_cb__holder,
+			  cdv_fun_cb,
+			  cdv_fun_cb__holder,
+			  cdv_atom_cb,
+			  cdv_atom_cb__holder,
+			  cdv_dist_cb,
+			  cdv_dist_cb__holder,
+			  cdv_mod_cb,
+			  cdv_mod_cb__holder],
+    Regs=[begin
+	      P=whereis(N),
+	      {P,N,erlang:monitor(process,P)}
+	  end || N <- ExpectedRegistered],
+    ct:log("CDV procs: ~n~p~n",[Regs]),
+    [true=is_pid(P) || {P,_,_} <- Regs],
     timer:sleep(5000), % give some time to live
     ok = crashdump_viewer:stop(),
-    timer:sleep(1000), % give some time to stop
-    undefined = whereis(crashdump_viewer_server),
-    undefined = whereis(cdv_wx),
-    ProcsAfter=length(processes()),
-    ProcsAfter=ProcsBefore,
+    recv_downs(Regs),
+    timer:sleep(2000),
+    ProcsAfter = processes(),
+    NumProcsAfter = length(ProcsAfter),
+    if NumProcsAfter=/=NumProcsBefore ->
+	    ct:log("Before but not after:~n~p~n",
+		   [[{P,process_info(P)} || P <- ProcsBefore -- ProcsAfter]]),
+	    ct:log("After but not before:~n~p~n",
+		   [[{P,process_info(P)} || P <- ProcsAfter -- ProcsBefore]]),
+	    ct:fail("leaking processes");
+       true ->
+	    ok
+    end,
     ok.
 
+recv_downs([]) ->
+    ok;
+recv_downs(Regs) ->
+    receive
+	{'DOWN',Ref,process,_Pid,_} ->
+	    ct:log("Got 'DOWN' for process ~n~p~n",[_Pid]),
+	    recv_downs(lists:keydelete(Ref,3,Regs))
+    after 30000 ->
+	    ct:log("Timeout waiting for down:~n~p~n",
+		   [[{Reg,process_info(P)} || {P,_,_}=Reg <- Regs]]),
+	    ct:log("Message queue:~n~p~n",[process_info(self(),messages)])
+    end.
+
 %% Try to load nonexisting file
 non_existing(Config) when is_list(Config) ->
     ExpectedReason = "non-existing-file is not an Erlang crash dump\n",
-- 
cgit v1.2.3