diff options
author | Peter Andersson <[email protected]> | 2010-08-06 00:00:49 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2010-09-02 14:44:54 +0200 |
commit | 8012586a816ad0509d137c4443bee97e6ff84146 (patch) | |
tree | 3a50babb8fad1e6addf1f78ec48f81fb2db4dccd /lib/common_test/test/ct_sequence_1_SUITE_data | |
parent | a05e853496d0d0fa5330c65ab6b1755cd6ecca3f (diff) | |
download | otp-8012586a816ad0509d137c4443bee97e6ff84146.tar.gz otp-8012586a816ad0509d137c4443bee97e6ff84146.tar.bz2 otp-8012586a816ad0509d137c4443bee97e6ff84146.zip |
Fix error with group term in ct:run_test/1
Also some new test cases on sequence groups have been added.
Diffstat (limited to 'lib/common_test/test/ct_sequence_1_SUITE_data')
-rw-r--r-- | lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl | 46 |
1 files changed, 37 insertions, 9 deletions
diff --git a/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl index 359d65816c..a25dbe772d 100644 --- a/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl +++ b/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl @@ -23,12 +23,25 @@ -include_lib("common_test/include/ct.hrl"). all() -> - [{group, test}]. + [{group, subgroup_return_fail}, + {group, subgroup_init_fail}, + {group, subgroup_after_failed_case}]. groups() -> - [{failing_group, [], [failing_tc]}, + [{return_fail, [], [failing_tc]}, + {fail_init, [], [ok_tc]}, {ok_group, [], [ok_tc]}, - {test, [sequence], [{group, failing_group}, {group, ok_group}]}]. + + {subgroup_return_fail, [sequence], [{group, return_fail}, {group, ok_group}]}, + + {subgroup_init_fail, [sequence], [{group, fail_init}, {group, ok_group}]}, + + {subgroup_after_failed_case, [sequence], [failing_tc, {group, ok_group}]} + ]. + +failed_subgroup(subgroup_return_fail) -> return_fail; +failed_subgroup(subgroup_init_fail) -> fail_init; +failed_subgroup(_) -> undefined. init_per_suite(Config) -> Config. @@ -36,21 +49,36 @@ init_per_suite(Config) -> end_per_suite(_Config) -> ok. -init_per_group(_Group, Config) -> - Config. +init_per_group(fail_init, Config) -> + ct:comment(fail_init), + exit(init_per_group_fails_on_purpose); + +init_per_group(Group, Config) -> + ct:comment(Group), + [{Group,failed_subgroup(Group)} | Config]. + +end_per_group(subgroup_after_failed_case, Config) -> + ct:comment(subgroup_after_failed_case), + Status = ?config(tc_group_result, Config), + [{subgroups_1_SUITE,failing_tc}] = proplists:get_value(failed, Status), + {return_group_result,failed}; -end_per_group(test, Config) -> +end_per_group(Group, Config) when Group == subgroup_return_fail; + Group == subgroup_init_fail -> + ct:comment(Group), Status = ?config(tc_group_result, Config), Failed = proplists:get_value(failed, Status), - true = lists:member({group_result,failing_group}, Failed), + true = lists:member({group_result,?config(Group,Config)}, Failed), {return_group_result,failed}; -end_per_group(failing_group, Config) -> +end_per_group(return_fail, Config) -> + ct:comment(return_fail), Status = ?config(tc_group_result, Config), [{subgroups_1_SUITE,failing_tc}] = proplists:get_value(failed, Status), {return_group_result,failed}; -end_per_group(_Group, _Config) -> +end_per_group(Group, _Config) -> + ct:comment(Group), ok. init_per_testcase(_TestCase, Config) -> |