aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_sup.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-11-07 12:05:35 +0100
committerSiri Hansen <[email protected]>2012-11-07 12:05:35 +0100
commitc1cfd8368b68e9caa91cb2da889d83d65277ac53 (patch)
tree8192860e6f1aabb970660c2e9b90c3ff4771e982 /lib/test_server/src/test_server_sup.erl
parentcecdbbd5eaf3d340c7bb3341eed664f5683bafd4 (diff)
parentca0d74c45c64f0c819ae50e245db7292e9ab47fe (diff)
downloadotp-c1cfd8368b68e9caa91cb2da889d83d65277ac53.tar.gz
otp-c1cfd8368b68e9caa91cb2da889d83d65277ac53.tar.bz2
otp-c1cfd8368b68e9caa91cb2da889d83d65277ac53.zip
Merge branch 'siri/user_timetrap-group-test/OTP-10018'
* siri/user_timetrap-group-test/OTP-10018: [common_test] Add tests for user timetraps in groups [test_server] Skip test cases if init_per_group fails in user timetrap [test_server] Add Config to run_test_case_msgloop/1 from the start
Diffstat (limited to 'lib/test_server/src/test_server_sup.erl')
-rw-r--r--lib/test_server/src/test_server_sup.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 3d00318b1b..ba5bb9f5d2 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -520,7 +520,7 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
end,
case SetTcState of
true ->
- test_server:set_tc_state({framework,Mod,Func}, undefined);
+ test_server:set_tc_state({framework,Mod,Func});
false ->
ok
end,