aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-06-07 12:24:26 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:25 +0200
commit4ed31623e145531a1aa84f6c1091481820f62099 (patch)
treed2703915f96c3bcb86da271a3fb293661777da18 /lib/test_server/src/test_server.erl
parente2698f918a4ec969593181fdad7d86064ef462f0 (diff)
downloadotp-4ed31623e145531a1aa84f6c1091481820f62099.tar.gz
otp-4ed31623e145531a1aa84f6c1091481820f62099.tar.bz2
otp-4ed31623e145531a1aa84f6c1091481820f62099.zip
Fix bug in handling framework:end_tc timeouts
Diffstat (limited to 'lib/test_server/src/test_server.erl')
-rw-r--r--lib/test_server/src/test_server.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index d6de907a1b..940935edf5 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1126,6 +1126,7 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
_ ->
{FWReturn,TSReturn,EndConf1}
end,
+ put(test_server_init_or_end_conf,undefined),
case test_server_sup:framework_call(end_tc, [?pl2a(Mod), Func,
{FWReturn1,[EndConf2]}]) of
{fail,Reason} ->