diff options
| author | Siri Hansen <[email protected]> | 2019-04-16 14:40:02 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-04-16 14:40:02 +0200 |
| commit | b1eea95392315e3602766af77e80d27b8e8c3af2 (patch) | |
| tree | b06ebf2310b44aa6928bd6da524df80beca8394e /lib/common_test/src/test_server_ctrl.erl | |
| parent | 9e03b5fa83ea33209e214a484e985db21bd41b4a (diff) | |
| parent | 62ed4780f713d86a9bca332945bf583111570978 (diff) | |
| download | otp-b1eea95392315e3602766af77e80d27b8e8c3af2.tar.gz otp-b1eea95392315e3602766af77e80d27b8e8c3af2.tar.bz2 otp-b1eea95392315e3602766af77e80d27b8e8c3af2.zip | |
Merge branch 'siri/ct/reset_curr_tc/ERIERL-334/OTP-15717' into maint
* siri/ct/reset_curr_tc/ERIERL-334/OTP-15717:
[ct] Cleanup after timetrap timeout or kill during framework call or hook
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 8bd6cd583a..a1c8be46e4 100644 --- a/lib/common_test/src/test_server_ctrl.erl +++ b/lib/common_test/src/test_server_ctrl.erl @@ -3841,6 +3841,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, |