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_sup.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_sup.erl')
-rw-r--r-- | lib/common_test/src/test_server_sup.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl index 26e7534c6c..ab8066a88d 100644 --- a/lib/common_test/src/test_server_sup.erl +++ b/lib/common_test/src/test_server_sup.erl @@ -770,7 +770,7 @@ framework_call(Callback,Func,Args,DefaultReturn) -> end, case SetTcState of true -> - test_server:set_tc_state({framework,Mod,Func}); + test_server:set_tc_state({framework,{Mod,Func,Args}}); false -> ok end, |