summaryrefslogtreecommitdiff
path: root/lib/test_server
diff options
context:
space:
mode:
authorPeter Andersson <peppe@erlang.org>2010-06-05 01:40:06 +0200
committerRaimo Niskanen <raimo@erlang.org>2010-06-09 16:19:23 +0200
commitcc372a2ba2aaa1de19935ff178d5dce88ec16854 (patch)
tree614f5810c6345eecc0ea82d82eeee01239d7edd7 /lib/test_server
parent1358ccecd1169d0c534137fb2c65759c7089cd0a (diff)
downloaderlang-cc372a2ba2aaa1de19935ff178d5dce88ec16854.tar.gz
Fix error with {repeat,0} property in groups causing double iterations
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/test_server_ctrl.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 49c8bfa2c9..9e6f1cedbb 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1572,6 +1572,8 @@ remove_conf([{conf, _Ref, Props, _MF}|Cases], NoConf, Repeats) ->
case get_repeat(Props) of
undefined ->
remove_conf(Cases, NoConf, Repeats);
+ {_RepType,0} ->
+ remove_conf(Cases, NoConf, Repeats);
_ ->
remove_conf(Cases, NoConf, true)
end;
@@ -2488,6 +2490,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
%% will continously update status with test case results
%% without knowing the Ref (but update hd(Status))
{false,new_status(Ref, Status1),Cases1,?void_fun};
+ {_RepType,0} ->
+ {false,new_status(Ref, Status1),Cases1,?void_fun};
_ ->
{Copied,_} = copy_cases(Ref, make_ref(), Cs1),
{true,new_status(Ref, Copied, Status1),Cases1,?void_fun}
@@ -2505,6 +2509,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
case RepVal of
undefined ->
{false,EndStatus,Cases1,?void_fun};
+ {_RepType,0} ->
+ {false,EndStatus,Cases1,?void_fun};
{repeat,_} ->
{true,EndStatus,CopiedCases++Cases1,?void_fun};
{repeat_until_all_ok,_} ->