diff options
author | Peter Andersson <[email protected]> | 2011-12-09 13:39:17 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2011-12-09 13:39:26 +0100 |
commit | 8cca19aecb36ad6da7ea506ba886a56253917e22 (patch) | |
tree | 28a66334246ecee30c14388a079c8126bf54463a /lib/common_test/test/ct_config_SUITE.erl | |
parent | 4743d3991ee56e5989563dde61bce91d625a05f4 (diff) | |
parent | 0c5481927c9b187d9f8bdb10bc12fd94f5923691 (diff) | |
download | otp-8cca19aecb36ad6da7ea506ba886a56253917e22.tar.gz otp-8cca19aecb36ad6da7ea506ba886a56253917e22.tar.bz2 otp-8cca19aecb36ad6da7ea506ba886a56253917e22.zip |
Merge remote branch 'origin/peppe/common_test/groups'
* origin/peppe/common_test/groups:
Change init/end_per_group/0 -> init/end_per_group/1
Add config info suite
Add tests for group specification and info function
Implement support for overriding group properties with test specification
Implement support for overriding group properties with all/0
Implement the group info function
OTP-9235
OTP-9569
OTP-9809
Diffstat (limited to 'lib/common_test/test/ct_config_SUITE.erl')
-rw-r--r-- | lib/common_test/test/ct_config_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl index 8ce75f582a..18218bee47 100644 --- a/lib/common_test/test/ct_config_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE.erl @@ -228,7 +228,7 @@ expected_events(config_static_SUITE)-> {?eh,tc_start,{config_static_SUITE,test_config_name_already_in_use2}}, {?eh,tc_done, {config_static_SUITE,test_config_name_already_in_use2, - {skipped,{config_name_already_in_use,[x1,alias]}}}}, + {skipped,{config_name_already_in_use,[alias,x1]}}}}, {?eh,test_stats,{4,0,{2,0}}}, {?eh,tc_start,{config_static_SUITE,test_alias_tclocal}}, {?eh,tc_done,{config_static_SUITE,test_alias_tclocal,ok}}, |