aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-06-07 18:41:43 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:26 +0200
commit10a06d2d2d1f967608877a8de2ad9c7fc5702353 (patch)
tree819cd57d2af17099a9bb10494627b20ee6f41afc /lib/common_test
parent2dbeff631ce93744972cb04039d434aa172d28f4 (diff)
downloadotp-10a06d2d2d1f967608877a8de2ad9c7fc5702353.tar.gz
otp-10a06d2d2d1f967608877a8de2ad9c7fc5702353.tar.bz2
otp-10a06d2d2d1f967608877a8de2ad9c7fc5702353.zip
Make {repeat*,N} property in group execute the group N times exactly
To be consistent with the behaviour of the run_test repeat flag/option, the repeat* group property has been changed to specify absolute number of test runs. Previously {repeat,N} meant "execute the group 1 time + N repeats". Now it means "execute the group N times".
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test/ct_groups_test_1_SUITE.erl40
-rw-r--r--lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl6
-rw-r--r--lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl6
-rw-r--r--lib/common_test/test/ct_groups_test_2_SUITE.erl32
-rw-r--r--lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl8
5 files changed, 46 insertions, 46 deletions
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE.erl
index 18a00f7f2b..64d61fc104 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE.erl
@@ -335,14 +335,14 @@ test_events(groups_suite_2) ->
{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
- [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+ [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
{?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3b}},
{?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
- {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+ {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
@@ -529,14 +529,14 @@ test_events(groups_suites_1) ->
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
- [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+ [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
{?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3b}},
{?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
- {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+ {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
@@ -715,14 +715,14 @@ test_events(groups_dir_1) ->
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
- [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+ [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
{?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3b}},
{?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
- {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+ {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
@@ -902,14 +902,14 @@ test_events(groups_dirs_1) ->
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
- [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+ [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
{?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3b}},
{?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
- {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
- {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+ {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+ {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
{?eh,tc_start,{groups_12_SUITE,testcase_3a}},
@@ -1130,17 +1130,17 @@ test_events(groups_dirs_1) ->
{?eh,tc_start,{groups_22_SUITE,testcase_2a}},
{?eh,tc_done,{groups_22_SUITE,testcase_2a,ok}},
[{?eh,tc_start,
- {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
+ {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
{?eh,tc_done,
- {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+ {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
{?eh,tc_start,{groups_22_SUITE,testcase_3a}},
{?eh,tc_done,{groups_22_SUITE,testcase_3a,ok}},
{?eh,tc_start,{groups_22_SUITE,testcase_3b}},
{?eh,tc_done,{groups_22_SUITE,testcase_3b,ok}},
{?eh,tc_start,
- {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
+ {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
{?eh,tc_done,
- {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+ {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
[{?eh,tc_start,
{groups_22_SUITE,{init_per_group,test_group_3,[]}}},
{?eh,tc_done,
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
index 22eacde1f3..ec90ef95d1 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
@@ -37,7 +37,7 @@ groups() ->
{test_group_2, [parallel], [testcase_2a,
- {test_group_3, [{repeat,1}],
+ {test_group_3, [{repeat,2}],
[testcase_3a, testcase_3b]},
testcase_2b]},
@@ -102,8 +102,8 @@ init_per_group(Group, Config) ->
io_lib:format("shuffled, ~w", [S]);
{test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
{test_group_2,[{name,test_group_2},parallel]} -> "parallel";
- {test_group_3,[{name,test_group_3},{repeat,1}]} -> "repeat 1";
- {test_group_3,[{name,test_group_3}]} -> "repeat 0";
+ {test_group_3,[{name,test_group_3},{repeat,2}]} -> "repeat 2";
+ {test_group_3,[{name,test_group_3}]} -> "repeat 1";
{test_group_4,[{name,test_group_4}]} -> ok;
{test_group_5,[{name,test_group_5},parallel]} -> "parallel";
{test_group_6,[{name,test_group_6},parallel]} -> "parallel";
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
index 2e19cf6310..ec0adc5df0 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
@@ -37,7 +37,7 @@ groups() ->
{test_group_2, [parallel], [testcase_2a,
- {test_group_3, [{repeat,1}],
+ {test_group_3, [{repeat,2}],
[testcase_3a, testcase_3b]},
testcase_2b]},
@@ -102,8 +102,8 @@ init_per_group(Group, Config) ->
io_lib:format("shuffled, ~w", [S]);
{test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
{test_group_2,[{name,test_group_2},parallel]} -> "parallel";
- {test_group_3,[{name,test_group_3},{repeat,1}]} -> "repeat 1";
- {test_group_3,[{name,test_group_3}]} -> "repeat 0";
+ {test_group_3,[{name,test_group_3},{repeat,2}]} -> "repeat 2";
+ {test_group_3,[{name,test_group_3}]} -> "repeat 1";
{test_group_4,[{name,test_group_4}]} -> ok;
{test_group_5,[{name,test_group_5},parallel]} -> "parallel";
{test_group_6,[{name,test_group_6},parallel]} -> "parallel";
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index bdf7303a59..56e0ac30c7 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -184,9 +184,9 @@ test_events(repeat_1) ->
{?eh,tc_start,{repeat_1_SUITE,init_per_suite}},
{?eh,tc_done,{repeat_1_SUITE,init_per_suite,ok}},
[{?eh,tc_start,
- {repeat_1_SUITE,{init_per_group,test_group_1,[{repeat,1}]}}},
+ {repeat_1_SUITE,{init_per_group,test_group_1,[{repeat,2}]}}},
{?eh,tc_done,
- {repeat_1_SUITE,{init_per_group,test_group_1,[{repeat,1}]},ok}},
+ {repeat_1_SUITE,{init_per_group,test_group_1,[{repeat,2}]},ok}},
{?eh,tc_start,{repeat_1_SUITE,testcase_1a}},
{?eh,tc_done,{repeat_1_SUITE,testcase_1a,ok}},
{?eh,test_stats,{1,0,{0,0}}},
@@ -194,9 +194,9 @@ test_events(repeat_1) ->
{?eh,tc_done,{repeat_1_SUITE,testcase_1b,ok}},
{?eh,test_stats,{2,0,{0,0}}},
{?eh,tc_start,
- {repeat_1_SUITE,{end_per_group,test_group_1,[{repeat,1}]}}},
+ {repeat_1_SUITE,{end_per_group,test_group_1,[{repeat,2}]}}},
{?eh,tc_done,
- {repeat_1_SUITE,{end_per_group,test_group_1,[{repeat,1}]},ok}}],
+ {repeat_1_SUITE,{end_per_group,test_group_1,[{repeat,2}]},ok}}],
[{?eh,tc_start,
{repeat_1_SUITE,{init_per_group,test_group_1,[]}}},
{?eh,tc_done,
@@ -212,9 +212,9 @@ test_events(repeat_1) ->
{?eh,tc_done,
{repeat_1_SUITE,{end_per_group,test_group_1,[]},ok}}],
[{?eh,tc_start,
- {repeat_1_SUITE,{init_per_group,test_group_2,[{repeat,0}]}}},
+ {repeat_1_SUITE,{init_per_group,test_group_2,[]}}},
{?eh,tc_done,
- {repeat_1_SUITE,{init_per_group,test_group_2,[{repeat,0}]},ok}},
+ {repeat_1_SUITE,{init_per_group,test_group_2,[]},ok}},
{?eh,tc_start,{repeat_1_SUITE,testcase_2a}},
{?eh,tc_done,{repeat_1_SUITE,testcase_2a,ok}},
{?eh,test_stats,{5,0,{0,0}}},
@@ -222,25 +222,25 @@ test_events(repeat_1) ->
{?eh,tc_done,{repeat_1_SUITE,testcase_2b,ok}},
{?eh,test_stats,{6,0,{0,0}}},
{?eh,tc_start,
- {repeat_1_SUITE,{end_per_group,test_group_2,[{repeat,0}]}}},
+ {repeat_1_SUITE,{end_per_group,test_group_2,[]}}},
{?eh,tc_done,
- {repeat_1_SUITE,{end_per_group,test_group_2,[{repeat,0}]},ok}}],
+ {repeat_1_SUITE,{end_per_group,test_group_2,[]},ok}}],
[{?eh,tc_start,
{repeat_1_SUITE,
- {init_per_group,test_group_3,[{repeat_until_all_fail,0}]}}},
+ {init_per_group,test_group_3,[]}}},
{?eh,tc_done,
{repeat_1_SUITE,
- {init_per_group,test_group_3,[{repeat_until_all_fail,0}]},
+ {init_per_group,test_group_3,[]},
ok}},
{?eh,tc_start,{repeat_1_SUITE,testcase_3a}},
{?eh,tc_done,{repeat_1_SUITE,testcase_3a,ok}},
{?eh,test_stats,{7,0,{0,0}}},
[{?eh,tc_start,
{repeat_1_SUITE,
- {init_per_group,test_group_4,[{repeat_until_any_fail,0}]}}},
+ {init_per_group,test_group_4,[]}}},
{?eh,tc_done,
{repeat_1_SUITE,
- {init_per_group,test_group_4,[{repeat_until_any_fail,0}]},
+ {init_per_group,test_group_4,[]},
ok}},
{?eh,tc_start,{repeat_1_SUITE,testcase_4a}},
{?eh,tc_done,{repeat_1_SUITE,testcase_4a,ok}},
@@ -250,20 +250,20 @@ test_events(repeat_1) ->
{?eh,test_stats,{9,0,{0,0}}},
{?eh,tc_start,
{repeat_1_SUITE,
- {end_per_group,test_group_4,[{repeat_until_any_fail,0}]}}},
+ {end_per_group,test_group_4,[]}}},
{?eh,tc_done,
{repeat_1_SUITE,
- {end_per_group,test_group_4,[{repeat_until_any_fail,0}]},
+ {end_per_group,test_group_4,[]},
ok}}],
{?eh,tc_start,{repeat_1_SUITE,testcase_3b}},
{?eh,tc_done,{repeat_1_SUITE,testcase_3b,ok}},
{?eh,test_stats,{10,0,{0,0}}},
{?eh,tc_start,
{repeat_1_SUITE,
- {end_per_group,test_group_3,[{repeat_until_all_fail,0}]}}},
+ {end_per_group,test_group_3,[]}}},
{?eh,tc_done,
{repeat_1_SUITE,
- {end_per_group,test_group_3,[{repeat_until_all_fail,0}]},
+ {end_per_group,test_group_3,[]},
ok}}],
{?eh,tc_start,{repeat_1_SUITE,end_per_suite}},
{?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl
index 4edbc3e384..91a0a2e882 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl
@@ -31,12 +31,12 @@ suite() ->
groups() ->
[
- {test_group_1, [{repeat,1}], [testcase_1a,testcase_1b]},
- {test_group_2, [{repeat,0}], [testcase_2a,testcase_2b]},
+ {test_group_1, [{repeat,2}], [testcase_1a,testcase_1b]},
+ {test_group_2, [{repeat,1}], [testcase_2a,testcase_2b]},
- {test_group_3, [{repeat_until_all_fail,0}],
+ {test_group_3, [{repeat_until_all_fail,1}],
[testcase_3a,
- {test_group_4, [{repeat_until_any_fail,0}],
+ {test_group_4, [{repeat_until_any_fail,1}],
[testcase_4a, testcase_4b]},
testcase_3b]}
].