diff options
| author | Peter Andersson <[email protected]> | 2010-08-20 16:26:13 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2010-09-06 15:08:58 +0200 |
| commit | ac713b2123e0d5b43ea65b259aeb2e228d1ece9d (patch) | |
| tree | 99de9b86d09c946f546a7b48a17aca9e3add683f /lib/test_server/src | |
| parent | edde5c4fd84cf06070c7fc4f8c159fc7ecba5099 (diff) | |
| download | otp-ac713b2123e0d5b43ea65b259aeb2e228d1ece9d.tar.gz otp-ac713b2123e0d5b43ea65b259aeb2e228d1ece9d.tar.bz2 otp-ac713b2123e0d5b43ea65b259aeb2e228d1ece9d.zip | |
Fix error in the repeat_until_* group property handling
Diffstat (limited to 'lib/test_server/src')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 9ab526a26b..1dc5646184 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -2567,7 +2567,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0, {true,EndStatus,RestCs,Fun}; {repeat_until_any_ok,_} -> {RestCs,Fun} = case get_tc_results(Status1) of - {Ok,_,_} when length(Ok) > 0 -> + {Ok,_,_Fails} when length(Ok) > 0 -> {Cases1,ReportStop}; _ -> {CopiedCases++Cases1,?void_fun} @@ -2734,9 +2734,10 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0, end; {value,{_,GroupResult}} -> {Cases,update_status(GroupResult, group_result, GrName, - delete_status(Ref, Status2))}; + delete_status(Ref, Status2))}; false -> - {Cases,delete_status(Ref, Status2)} + {Cases,update_status(ok, group_result, GrName, + delete_status(Ref, Status2))} end, print_conf_time(ConfTime), ReportRepeatStop(), @@ -2876,7 +2877,10 @@ get_copied_cases([{_,{_,Cases}} | _Status]) -> Cases. get_tc_results([{_,{OkSkipFail,_}} | _Status]) -> - OkSkipFail. + OkSkipFail; +get_tc_results([]) -> % in case init_per_suite crashed + {[],[],[]}. + conf(Ref, Props) -> {Ref,Props,?now}. |