Fix error with group term in ct:run_test/1

Also some new test cases on sequence groups have been added.

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) ->