4 files changed, 31 insertions, 8 deletions
diff --git a/lib/test_server/src/test_server_gl.erl b/lib/test_server/src/test_server_gl.erl
index 766a4537a2..1f7317c51d 100644
--- a/lib/test_server/src/test_server_gl.erl
+++ b/lib/test_server/src/test_server_gl.erl
@@ -166,7 +166,7 @@ handle_info({'DOWN',Ref,process,_,Reason}=D, #st{minor_monitor=Ref}=St) ->
 	    Data = io_lib:format("=== WARNING === TC: ~w\n"
 				 "Got down from minor Fd ~w: ~w\n\n",
 				 [St#st.tc,St#st.minor,D]),
-	    test_server_io:print(xxxFrom, unexpected_io, Data)
+	    test_server_io:print_unexpected(Data)
     end,
     {noreply,St#st{minor=none,minor_monitor=none}};
 handle_info({permit_io,Pid}, #st{permit_io=P}=St) ->
@@ -197,7 +197,7 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
 	    From ! {io_reply,ReplyAs,ok}
     catch
 	_:_ ->
-	    {io_reply,ReplyAs,{error,arguments}}
+	    From ! {io_reply,ReplyAs,{error,arguments}}
     end,
     {noreply,St};
 handle_info({structured_io,ClientPid,{Detail,Str}}, St) ->
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl
index 242c08f765..a979deffc3 100644
--- a/lib/test_server/src/test_server_io.erl
+++ b/lib/test_server/src/test_server_io.erl
@@ -30,7 +30,8 @@
 
 -module(test_server_io).
 -export([start_link/0,stop/0,get_gl/1,set_fd/2,
-	 start_transaction/0,end_transaction/0,print_buffered/1,print/3,
+	 start_transaction/0,end_transaction/0,
+	 print_buffered/1,print/3,print_unexpected/1,
 	 set_footer/1,set_job_name/1,set_gl_props/1]).
 
 -export([init/1,handle_call/3,handle_info/2,terminate/2]).
@@ -124,6 +125,14 @@ print(From, Tag, Msg) ->
 print_buffered(Pid) ->
     req({print_buffered,Pid}).
 
+%% print_unexpected(Msg)
+%%  Msg = string or iolist
+%%
+%%  Print the given string in the unexpected_io log.
+
+print_unexpected(Msg) ->
+    print(xxxFrom,unexpected_io,Msg).
+
 %% set_footer(IoData)
 %%
 %%  Set a footer for the file associated with the 'html' tag.
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 1a2fc632da..3db2f5f9f1 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -104,7 +104,7 @@ test_server_SUITE(Config) ->
 %    rpc:call(Node,dbg, tpl,[test_server_ctrl,x]),
     run_test_server_tests("test_server_SUITE",
 			  [{test_server_SUITE,skip_case7,"SKIPPED!"}],
-			  38, 1, 30, 19, 9, 1, 11, 2, 25, Config).
+			  40, 1, 32, 21, 9, 1, 11, 2, 27, Config).
 
 test_server_parallel01_SUITE(Config) ->
     run_test_server_tests("test_server_parallel01_SUITE", [],
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
index fc2adcd651..541e8fdefc 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -38,7 +38,8 @@
 	 conf_init/1, check_new_conf/1, conf_cleanup/1,
 	 check_old_conf/1, conf_init_fail/1, start_stop_node/1,
 	 cleanup_nodes_init/1, check_survive_nodes/1, cleanup_nodes_fin/1,
-	 commercial/1]).
+	 commercial/1,
+	 io_invalid_data/1, print_unexpected/1]).
 
 -export([dummy_function/0,dummy_function/1,doer/1]).
 
@@ -47,7 +48,7 @@ all(suite) ->
     [config, comment, timetrap, timetrap_cancel, multiply_timetrap,
      init_per_s, init_per_tc, end_per_tc,
      timeconv, msgs, capture, timecall, do_times, skip_cases,
-     commercial,
+     commercial, io_invalid_data, print_unexpected,
      {conf, conf_init, [check_new_conf], conf_cleanup},
      check_old_conf,
      {conf, conf_init_fail,[conf_member_skip],conf_cleanup_skip},
@@ -497,4 +498,17 @@ commercial(Config) when is_list(Config) ->
 	true -> {comment,"Commercial build"}
     end.
 
-	    
+io_invalid_data(Config) when is_list(Config) ->
+    ok = io:put_chars("valid: " ++ [42]),
+    %% OTP-10991 caused this to hang and produce a timetrap timeout:
+    {'EXIT',{badarg,_}} = (catch io:put_chars("invalid: " ++ [42.0])),
+    ok.
+
+print_unexpected(Config) when is_list(Config) ->
+    Str = "-x-x-x- test_server_SUITE:print_unexpected -> Unexpected data -x-x-x-",
+    test_server_io:print_unexpected(Str),
+    UnexpectedLog = filename:join(filename:dirname(?config(tc_logfile,Config)),
+				  "unexpected_io.log.html"),
+    {ok,Bin} = file:read_file(UnexpectedLog),
+    match = re:run(Bin, Str, [global,{capture,none}]),
+    ok.