diff options
| author | Siri Hansen <[email protected]> | 2019-04-01 16:36:20 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-04-15 11:02:37 +0200 |
| commit | 62ed4780f713d86a9bca332945bf583111570978 (patch) | |
| tree | 0303c7341885e8284072e567f336aef37c086a96 /lib/common_test/src/test_server_ctrl.erl | |
| parent | 8ab1bc2af5933b36c1583b1168e9b7875334cd50 (diff) | |
| download | otp-62ed4780f713d86a9bca332945bf583111570978.tar.gz otp-62ed4780f713d86a9bca332945bf583111570978.tar.bz2 otp-62ed4780f713d86a9bca332945bf583111570978.zip | |
[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.
Diffstat (limited to 'lib/common_test/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/common_test/src/test_server_ctrl.erl | 4 |
1 files changed, 4 insertions, 0 deletions
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, |