aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2014-04-30 00:25:42 +0200
committerPeter Andersson <[email protected]>2014-04-30 00:25:42 +0200
commitaf8a352109ba87f7960ab46bd6ed1d237b87ed7c (patch)
tree8fed4dc185fb67a922ae81650f9cd08011ce2a3a /lib/test_server
parentaca0b6182b039333b4c963938878d9eecc85e5a1 (diff)
downloadotp-af8a352109ba87f7960ab46bd6ed1d237b87ed7c.tar.gz
otp-af8a352109ba87f7960ab46bd6ed1d237b87ed7c.tar.bz2
otp-af8a352109ba87f7960ab46bd6ed1d237b87ed7c.zip
Fix problem with comments getting lost when running parallel test cases
OTP-11898
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/test_server.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 9b05bddf63..70dc7a1441 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -444,7 +444,7 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
%% If this process (group leader of the test case) terminates before
%% all messages have been replied back to the io server, the io server
%% hangs. Fixed by the 20 milli timeout check here, and by using monitor in
-%% io.erl (livrem OCH hangslen mao :)
+%% io.erl.
%%
%% A test case is known to have failed if it returns {'EXIT', _} tuple,
%% or sends a message {failed, File, Line} to it's group_leader
@@ -673,7 +673,7 @@ handle_tc_exit({testcase_aborted,{user_timetrap_error,_}=Msg,_}, St) ->
spawn_fw_call(Mod, Func, Config, Pid, Msg, unknown, self()),
St;
handle_tc_exit(Reason, #st{status={framework,FwMod,FwFunc},
- config=Config,pid=Pid}=St) ->
+ config=Config,pid=Pid}=St) ->
R = case Reason of
{timetrap_timeout,TVal,_} ->
{timetrap,TVal};