aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorSiri Hansen <siri@erlang.org>2017-01-25 10:37:11 +0100
committerSiri Hansen <siri@erlang.org>2017-02-15 17:31:19 +0100
commitd64fa0f13cd07b48291d1ab3b843c411aaf8451d (patch)
treea3033f4d4b5447dc89913670f7a9e7c6d458fdee /lib/common_test
parentaa1a098b46d0a4d8dd122efcc78a7a1a3f6c6e4e (diff)
downloadotp-d64fa0f13cd07b48291d1ab3b843c411aaf8451d.tar.gz
otp-d64fa0f13cd07b48291d1ab3b843c411aaf8451d.tar.bz2
otp-d64fa0f13cd07b48291d1ab3b843c411aaf8451d.zip
[ct] Fix function_clause in ct_framework when hook function crashes
If CtHook:pre_init_per_testcase(...,end_per_testcase,...) failed, then the ct_framework:end_tc would fail with function_clause. This is now corrected.
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/src/test_server.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index 924086f2bd..0787a323f3 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -1156,7 +1156,7 @@ do_end_tc_call(Mod, IPTC={init_per_testcase,Func}, Res, Return) ->
{ok,EPTCInitConfig} when is_list(EPTCInitConfig) ->
{Return,EPTCInitConfig};
_ ->
- Return
+ {Return,IPTCEndRes}
end,
do_end_tc_call1(Mod, {end_per_testcase,Func},
EPTCInitRes, Return);