2 files changed, 43 insertions, 4 deletions
diff --git a/lib/common_test/test/ct_group_leader_SUITE.erl b/lib/common_test/test/ct_group_leader_SUITE.erl
index cde3061d6a..6d54a4c004 100644
--- a/lib/common_test/test/ct_group_leader_SUITE.erl
+++ b/lib/common_test/test/ct_group_leader_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -176,6 +176,10 @@ events_to_check(_Test) ->
 		{?eh,tc_done,{group_leader_SUITE,cap1,ok}},
 		{?eh,tc_start,{group_leader_SUITE,cap2}},
 		{?eh,tc_done,{group_leader_SUITE,cap2,ok}}]},
+     {parallel,[{?eh,tc_start,{group_leader_SUITE,unexp1}},
+		{?eh,tc_done,{group_leader_SUITE,unexp1,ok}},
+		{?eh,tc_start,{group_leader_SUITE,unexp2}},
+		{?eh,tc_done,{group_leader_SUITE,unexp2,ok}}]},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl b/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl
index 3f1844b4ae..804f722081 100644
--- a/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl
+++ b/lib/common_test/test/ct_group_leader_SUITE_data/group_leader_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -112,7 +112,8 @@ groups() ->
      {seq,[],[s1,s2,s3]},
      {seq2,[],[s4,s5]},
      {seq_in_par,[parallel],[p10,p11,{group,seq},p12,{group,seq2},p13]},
-     {capture_io,[parallel],[cap1,cap2]}].
+     {capture_io,[parallel],[cap1,cap2]},
+     {unexpected_io,[parallel],[unexp1,unexp2]}].
 
 %%--------------------------------------------------------------------
 %% @spec all() -> GroupsAndTestCases | {skip,Reason}
@@ -126,7 +127,8 @@ all() ->
     [tc1,{group,p},{group,p_restart},p3,
      {group,seq_in_par},
      cap1,cap2,
-     {group,capture_io}].
+     {group,capture_io},
+     {group,unexpected_io}].
 
 tc1(_C) ->
     ok.
@@ -250,3 +252,36 @@ gen_io(Label, N, Acc) ->
     S = lists:flatten(io_lib:format("~s: ~p\n", [Label,N])),
     io:put_chars(S),
     gen_io(Label, N-1, [S|Acc]).
+
+%% Test that unexpected I/O is sent to test_server's unexpeced_io log.
+%% To trigger this, run two test cases in parallel and send a printout
+%% (via ct logging functions) from an external process which has a
+%% different group leader than the test cases.
+unexp1(Config) ->
+    timer:sleep(1000),
+    gen_unexp_io(),
+    timer:sleep(1000),
+    check_unexp_io(Config),
+    ok.
+
+unexp2(_) ->
+    timer:sleep(2000),
+    ok.
+
+gen_unexp_io() ->
+    spawn(fun() ->
+		  group_leader(whereis(user),self()),
+		  ct:log("-x- Unexpected io ct:log -x-",[]),
+		  ct:pal("-x- Unexpected io ct:pal -x-",[]),
+		  ok
+	  end).
+
+check_unexp_io(Config) ->
+    SuiteLog = ?config(tc_logfile,Config),
+    Dir = filename:dirname(SuiteLog),
+    UnexpLog = filename:join(Dir,"unexpected_io.log.html"),
+    {ok,SuiteBin} = file:read_file(SuiteLog),
+    nomatch = re:run(SuiteBin,"-x- Unexpected io ",[global,{capture,none}]),
+    {ok,UnexpBin} = file:read_file(UnexpLog),
+    {match,[_,_]} = re:run(UnexpBin,"-x- Unexpected io ",[global]),
+    ok.