diff options
author | Siri Hansen <[email protected]> | 2013-05-27 09:33:02 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2013-05-27 09:33:02 +0200 |
commit | 429e9d8ce78f7498e06e252e487c75cea6c585d4 (patch) | |
tree | 8ba4cb73888a1d55226085542f897824fd85d4fd /lib/common_test/test/ct_telnet_SUITE.erl | |
parent | 3f7107a53d59a2dc35163e8c6119164dfb9e6822 (diff) | |
parent | 28f3a4a5713487cb6ade48f2d142d8c2d5b7ac6e (diff) | |
download | otp-429e9d8ce78f7498e06e252e487c75cea6c585d4.tar.gz otp-429e9d8ce78f7498e06e252e487c75cea6c585d4.tar.bz2 otp-429e9d8ce78f7498e06e252e487c75cea6c585d4.zip |
Merge branch 'siri/ct_telnet/no-more-after-timetrap/OTP-10648' into maint
* siri/ct_telnet/no-more-after-timetrap/OTP-10648:
[common_test] Unregister connection if killed
Diffstat (limited to 'lib/common_test/test/ct_telnet_SUITE.erl')
-rw-r--r-- | lib/common_test/test/ct_telnet_SUITE.erl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl index 17617f59eb..e2ee207754 100644 --- a/lib/common_test/test/ct_telnet_SUITE.erl +++ b/lib/common_test/test/ct_telnet_SUITE.erl @@ -72,7 +72,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [ unix_telnet, - own_server + own_server, + timetrap ]. %%-------------------------------------------------------------------- @@ -88,6 +89,10 @@ own_server(Config) -> all_tests_in_suite(own_server,"ct_telnet_own_server_SUITE", "telnet2.cfg",Config). +timetrap(Config) -> + all_tests_in_suite(timetrap,"ct_telnet_timetrap_SUITE", + "telnet3.cfg",Config). + %%%----------------------------------------------------------------- %%% HELP FUNCTIONS %%%----------------------------------------------------------------- @@ -143,7 +148,13 @@ telnet_config(_) -> events_to_check(unix_telnet,Config) -> all_cases(ct_telnet_basic_SUITE,Config); events_to_check(own_server,Config) -> - all_cases(ct_telnet_own_server_SUITE,Config). + all_cases(ct_telnet_own_server_SUITE,Config); +events_to_check(timetrap,_Config) -> + [{?eh,start_logging,{'DEF','RUNDIR'}}, + {?eh,tc_done,{ct_telnet_timetrap_SUITE,expect_timetrap, + {failed,{timetrap_timeout,7000}}}}, + {?eh,tc_done,{ct_telnet_timetrap_SUITE,expect_success,ok}}, + {?eh,stop_logging,[]}]. all_cases(Suite,Config) -> {module,_} = code:load_abs(filename:join(?config(data_dir,Config), |