diff options
| author | Siri Hansen <[email protected]> | 2012-11-07 12:05:35 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-11-07 12:05:35 +0100 |
| commit | c1cfd8368b68e9caa91cb2da889d83d65277ac53 (patch) | |
| tree | 8192860e6f1aabb970660c2e9b90c3ff4771e982 /lib/test_server/src/test_server_ctrl.erl | |
| parent | cecdbbd5eaf3d340c7bb3341eed664f5683bafd4 (diff) | |
| parent | ca0d74c45c64f0c819ae50e245db7292e9ab47fe (diff) | |
| download | otp-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_ctrl.erl')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 50208410a9..4e465c02d1 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -2933,6 +2933,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0, exit(framework_error); {_,Fail,_} when element(1,Fail) == 'EXIT'; element(1,Fail) == timetrap_timeout; + element(1,Fail) == user_timetrap_error; element(1,Fail) == failed -> {Cases2,Config1,Status3} = if StartConf -> @@ -2952,14 +2953,6 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0, set_io_buffering(IOHandler), stop_minor_log_file(), run_test_cases_loop(Cases2, Config1, TimetrapData, Mode, Status3); - {died,Why,_} when Func == init_per_suite -> - print(minor, "~n*** Unexpected exit during init_per_suite.~n", []), - Reason = {failed,{Mod,init_per_suite,Why}}, - Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode), - set_io_buffering(IOHandler), - stop_minor_log_file(), - run_test_cases_loop(Cases2, Config, TimetrapData, Mode, - delete_status(Ref, Status2)); {_,{Skip,Reason},_} when StartConf and ((Skip==skip) or (Skip==skipped)) -> ReportAbortRepeat(skipped), print(minor, "~n*** ~p skipped.~n" |