From 62ed4780f713d86a9bca332945bf583111570978 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Mon, 1 Apr 2019 16:36:20 +0200 Subject: [ct] Cleanup after timetrap timeout or kill during framework call or hook If a framework callback function exits due to a timetrap timeout, or the process in other way is killed, during the execution of such function, some internal common_test data was not cleaned up. An example of such data is the 'curr_tc' test data. This is now corrected. --- lib/common_test/src/test_server_ctrl.erl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/common_test/src/test_server_ctrl.erl') diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl index 8ef28b3343..69669bbeef 100644 --- a/lib/common_test/src/test_server_ctrl.erl +++ b/lib/common_test/src/test_server_ctrl.erl @@ -3840,6 +3840,10 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, {died,{timetrap_timeout,TimetrapTimeout}} -> progress(failed, Num, Mod, Func, GrName, Loc, timetrap_timeout, TimetrapTimeout, Comment, Style); + {died,Reason={auto_skip,_Why}} -> + %% died in init_per_testcase or in a hook in this context + progress(skip, Num, Mod, Func, GrName, Loc, Reason, + Time, Comment, Style); {died,{Skip,Reason}} when Skip==skip; Skip==skipped -> %% died in init_per_testcase progress(skip, Num, Mod, Func, GrName, Loc, Reason, -- cgit v1.2.3