diff options
| author | Peter Andersson <[email protected]> | 2013-02-17 18:22:38 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-02-18 11:35:45 +0100 |
| commit | 0164fa89fcf83cef70e1f5228fa66b43105c07aa (patch) | |
| tree | 27b81b0b56c7a5634e21d2239f5e4827a2abf664 /lib | |
| parent | cd1380fdf78018d1c49678cf985051f48e70f219 (diff) | |
| download | otp-0164fa89fcf83cef70e1f5228fa66b43105c07aa.tar.gz otp-0164fa89fcf83cef70e1f5228fa66b43105c07aa.tar.bz2 otp-0164fa89fcf83cef70e1f5228fa66b43105c07aa.zip | |
Fix problems with verbosity test suite
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 9 | ||||
| -rw-r--r-- | lib/common_test/test/ct_verbosity_SUITE.erl | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 7c33fd404d..5e109e98e9 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -312,8 +312,10 @@ wait_for_ct_stop(Retries, CTNode) -> undefined -> true; Pid -> + Info = (catch process_info(Pid)), test_server:format(0, "Waiting for CT (~p) to finish (~p)...", [Pid,Retries]), + test_server:format(0, "Process info for ~p:~n~p", [Info]), timer:sleep(5000), wait_for_ct_stop(Retries-1, CTNode) end. @@ -328,12 +330,17 @@ handle_event(EH, Event) -> start_event_receiver(Config) -> CTNode = proplists:get_value(ct_node, Config), - spawn_link(CTNode, fun() -> er() end). + Level = proplists:get_value(trace_level, Config), + ER = spawn_link(CTNode, fun() -> er() end), + test_server:format(Level, "~nEvent receiver ~w started!~n", [ER]), + ER. get_events(_, Config) -> CTNode = proplists:get_value(ct_node, Config), + Level = proplists:get_value(trace_level, Config), {event_receiver,CTNode} ! {self(),get_events}, Events = receive {event_receiver,Evs} -> Evs end, + test_server:format(Level, "Stopping event receiver!~n", []), {event_receiver,CTNode} ! stop, Events. diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl index 0baa483281..198d4c44b5 100644 --- a/lib/common_test/test/ct_verbosity_SUITE.erl +++ b/lib/common_test/test/ct_verbosity_SUITE.erl @@ -59,7 +59,7 @@ init_per_testcase(TestCase, Config) -> end_per_testcase(TestCase, Config) -> ct_test_support:end_per_testcase(TestCase, Config). -suite() -> [{timetrap,{seconds,10}}, +suite() -> [{timetrap,{seconds,30}}, {ct_hooks,[ts_install_cth]}]. all() -> |