diff options
| author | Peter Andersson <[email protected]> | 2013-11-28 17:37:25 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-11-28 17:37:33 +0100 |
| commit | ac7902caa784d4f4c73eb7291ab4736a75ad13a4 (patch) | |
| tree | 7c292d5ffd0907a42efb49e8ab1c60f4ab515649 /lib/common_test/test/ct_config_SUITE.erl | |
| parent | 9f998969014095333545cb118467e1ff8d450c31 (diff) | |
| parent | 093890dc793e85a09b40f1eca878f410c73cf625 (diff) | |
| download | otp-ac7902caa784d4f4c73eb7291ab4736a75ad13a4.tar.gz otp-ac7902caa784d4f4c73eb7291ab4736a75ad13a4.tar.bz2 otp-ac7902caa784d4f4c73eb7291ab4736a75ad13a4.zip | |
Merge remote branch 'origin/peppe/common_test/change_skip_behaviour' into maint
* origin/peppe/common_test/change_skip_behaviour:
Modify the auto_skip report for group config funcs to include group name
Fix problems with info functions and add more tests
Add test cases for new and modified functionality
Fix problem with suites and groups skipped from test specification
Change report tag for failed init_per_testcase from skipped to auto_skipped
Add tests for skipping parallel groups
Correct tests cases that fail because of modified events
Correct various bugs related to auto_skip and groups
Change status from skip to auto_skip for config func that fails due to require
Fix problem with handling Config and FW reports correctly
Change skip vs auto_skip behaviour
OTP-11305
Diffstat (limited to 'lib/common_test/test/ct_config_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_config_SUITE.erl | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl index d92be9ec6e..284f836517 100644 --- a/lib/common_test/test/ct_config_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE.erl @@ -234,25 +234,25 @@ expected_events(config_static_SUITE)-> ?sok(test_get_config_deep_nested,{3,0,{0,0}}), ?sok(test_default_suitewide,{4,0,{0,0}}), ?snok(test_config_name_already_in_use1, - {skipped,{config_name_already_in_use,[x1]}},{4,0,{1,0}}), - ?sok(test_default_tclocal,{5,0,{1,0}}), + {failed,{error,{config_name_already_in_use,[x1]}}},{4,1,{0,0}}), + ?sok(test_default_tclocal,{5,1,{0,0}}), ?snok(test_config_name_already_in_use2, - {skipped,{config_name_already_in_use,[alias,x1]}},{5,0,{2,0}}), - ?sok(test_alias_tclocal,{6,0,{2,0}}), - ?sok(test_get_config_undefined,{7,0,{2,0}}), - ?sok(test_require_subvals,{8,0,{2,0}}), + {failed,{error,{config_name_already_in_use,[alias,x1]}}},{5,2,{0,0}}), + ?sok(test_alias_tclocal,{6,2,{0,0}}), + ?sok(test_get_config_undefined,{7,2,{0,0}}), + ?sok(test_require_subvals,{8,2,{0,0}}), ?snok(test_require_subvals2, - {skipped,{require_failed, - {not_available,{gen_cfg,[a,b,c,d]}}}},{8,0,{2,1}}), - ?sok(test_require_deep_config,{9,0,{2,1}}), - ?sok(test_shadow_all,{10,0,{2,1}}), - ?sok(test_element,{11,0,{2,1}}), - ?sok(test_shadow_all_element,{12,0,{2,1}}), - ?sok(test_internal_deep,{13,0,{2,1}}), - ?sok(test_alias_tclocal_nested,{14,0,{2,1}}), - ?sok(test_alias_tclocal_nested_backward_compat,{15,0,{2,1}}), - ?sok(test_alias_tclocal_nested_backward_compat_subvals,{16,0,{2,1}}), - ?sok(test_config_same_name_already_in_use,{17,0,{2,1}}), + {auto_skipped,{require_failed, + {not_available,{gen_cfg,[a,b,c,d]}}}},{8,2,{0,1}}), + ?sok(test_require_deep_config,{9,2,{0,1}}), + ?sok(test_shadow_all,{10,2,{0,1}}), + ?sok(test_element,{11,2,{0,1}}), + ?sok(test_shadow_all_element,{12,2,{0,1}}), + ?sok(test_internal_deep,{13,2,{0,1}}), + ?sok(test_alias_tclocal_nested,{14,2,{0,1}}), + ?sok(test_alias_tclocal_nested_backward_compat,{15,2,{0,1}}), + ?sok(test_alias_tclocal_nested_backward_compat_subvals,{16,2,{0,1}}), + ?sok(test_config_same_name_already_in_use,{17,2,{0,1}}), {?eh,tc_start,{config_static_SUITE,end_per_suite}}, {?eh,tc_done,{config_static_SUITE,end_per_suite,ok}}, {?eh,test_done,{'DEF','STOP_TIME'}}, |