aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-08-06 00:00:49 +0200
committerPeter Andersson <[email protected]>2010-09-02 14:44:54 +0200
commit8012586a816ad0509d137c4443bee97e6ff84146 (patch)
tree3a50babb8fad1e6addf1f78ec48f81fb2db4dccd /lib/common_test/test
parenta05e853496d0d0fa5330c65ab6b1755cd6ecca3f (diff)
downloadotp-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')
-rw-r--r--lib/common_test/test/ct_sequence_1_SUITE.erl64
-rw-r--r--lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl46
2 files changed, 88 insertions, 22 deletions
diff --git a/lib/common_test/test/ct_sequence_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE.erl
index 55aca764fb..f7cb984fc6 100644
--- a/lib/common_test/test/ct_sequence_1_SUITE.erl
+++ b/lib/common_test/test/ct_sequence_1_SUITE.erl
@@ -57,7 +57,9 @@ end_per_testcase(TestCase, Config) ->
ct_test_support:end_per_testcase(TestCase, Config).
all(suite) ->
- [subgroup].
+ [subgroup_return_fail,
+ subgroup_init_fail,
+ subgroup_after_failed_case].
%%--------------------------------------------------------------------
%% TEST CASES
@@ -66,31 +68,51 @@ all(suite) ->
%%%-----------------------------------------------------------------
%%%
-subgroup(Config) when is_list(Config) ->
- DataDir = ?config(data_dir, Config),
+subgroup_return_fail(Config) when is_list(Config) ->
+ execute(subgroup_return_fail,
+ "subgroups_1_SUITE", subgroup_return_fail,
+ Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup_init_fail(Config) when is_list(Config) ->
+ execute(subgroup_init_fail,
+ "subgroups_1_SUITE", subgroup_init_fail,
+ Config).
+
+%%%-----------------------------------------------------------------
+%%%
- Suite = filename:join(DataDir, "subgroups_1_SUITE"),
+subgroup_after_failed_case(Config) when is_list(Config) ->
+ execute(subgroup_after_failed_case,
+ "subgroups_1_SUITE", subgroup_after_failed_case,
+ Config).
- {Opts,ERPid} = setup({suite,Suite}, Config),
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+execute(TestCase, SuiteName, Group, Config) ->
+ DataDir = ?config(data_dir, Config),
+ Suite = filename:join(DataDir, SuiteName),
+
+ {Opts,ERPid} = setup([{suite,Suite},{group,Group},{label,TestCase}], Config),
ok = ct_test_support:run(Opts, Config),
Events = ct_test_support:get_events(ERPid, Config),
- ct_test_support:log_events(subgroup,
+ ct_test_support:log_events(TestCase,
reformat(Events, ?eh),
?config(priv_dir, Config)),
- TestEvents = events_to_check(subgroup),
+ TestEvents = events_to_check(TestCase),
ok = ct_test_support:verify_events(TestEvents, Events, Config).
-%%%-----------------------------------------------------------------
-%%% HELP FUNCTIONS
-%%%-----------------------------------------------------------------
-
setup(Test, Config) ->
Opts0 = ct_test_support:get_opts(Config),
Level = ?config(trace_level, Config),
EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
- Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}],
+ Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}} | Test],
ERPid = ct_test_support:start_event_receiver(Config),
{Opts,ERPid}.
@@ -111,7 +133,23 @@ events_to_check(_, 0) ->
events_to_check(Test, N) ->
test_events(Test) ++ events_to_check(Test, N-1).
-test_events(subgroup) ->
+test_events(subgroup_return_fail) ->
+ [
+ {?eh,start_logging,{'DEF','RUNDIR'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+ {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,stop_logging,[]}
+ ];
+
+test_events(subgroup_init_fail) ->
+ [
+ {?eh,start_logging,{'DEF','RUNDIR'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+ {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,stop_logging,[]}
+ ];
+
+test_events(subgroup_after_failed_case) ->
[
{?eh,start_logging,{'DEF','RUNDIR'}},
{?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
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) ->