diff options
| author | Peter Andersson <[email protected]> | 2013-11-28 17:38:41 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-11-28 17:38:41 +0100 |
| commit | a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb (patch) | |
| tree | 056af044a1103d1d3f6c9df5bf2992a02b8fc48c /lib/common_test/test/ct_config_info_SUITE.erl | |
| parent | 23a30d882464df4210ea53096ea50e7b44876812 (diff) | |
| parent | ac7902caa784d4f4c73eb7291ab4736a75ad13a4 (diff) | |
| download | otp-a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb.tar.gz otp-a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb.tar.bz2 otp-a4565bd7d6e8362b3ca1ff0caedf7407e81d67cb.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/test/ct_config_info_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_config_info_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_config_info_SUITE.erl b/lib/common_test/test/ct_config_info_SUITE.erl index 10fe8286dd..8f2f0eb75f 100644 --- a/lib/common_test/test/ct_config_info_SUITE.erl +++ b/lib/common_test/test/ct_config_info_SUITE.erl @@ -127,7 +127,7 @@ test_events(config_info) -> {failed,{timetrap_timeout,350}}}}, {?eh,tc_auto_skip,{config_info_1_SUITE,t11, {failed,{config_info_1_SUITE,init_per_group,{timetrap_timeout,350}}}}}, - {?eh,tc_auto_skip,{config_info_1_SUITE,end_per_group, + {?eh,tc_auto_skip,{config_info_1_SUITE,{end_per_group,g1}, {failed,{config_info_1_SUITE,init_per_group, {timetrap_timeout,350}}}}}], @@ -145,12 +145,12 @@ test_events(config_info) -> {?eh,tc_auto_skip,{config_info_1_SUITE,t41, {failed,{config_info_1_SUITE,init_per_group, {timetrap_timeout,400}}}}}, - {?eh,tc_auto_skip,{config_info_1_SUITE,end_per_group, + {?eh,tc_auto_skip,{config_info_1_SUITE,{end_per_group,g4}, {failed,{config_info_1_SUITE,init_per_group, {timetrap_timeout,400}}}}}], {?eh,tc_start,{config_info_1_SUITE,t31}}, {?eh,tc_done,{config_info_1_SUITE,t31, - {skipped,{failed,{config_info_1_SUITE,init_per_testcase, + {auto_skipped,{failed,{config_info_1_SUITE,init_per_testcase, {timetrap_timeout,250}}}}}}, {?eh,tc_start,{config_info_1_SUITE,t32}}, {?eh,tc_done,{config_info_1_SUITE,t32, |