diff options
| author | Peter Andersson <[email protected]> | 2015-03-26 01:51:20 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-03-26 01:51:20 +0100 |
| commit | d28310bd395aa4465c89aa3175d59a1886294c78 (patch) | |
| tree | 716a1fa3b9314a0efcdee3fdbdf48d532c49b3a8 /lib/common_test/test | |
| parent | dcf096a77d94a16d46ae553263f9dcd3be5a884b (diff) | |
| parent | 2c386b51781434a69ae4245237b393296a1579af (diff) | |
| download | otp-d28310bd395aa4465c89aa3175d59a1886294c78.tar.gz otp-d28310bd395aa4465c89aa3175d59a1886294c78.tar.bz2 otp-d28310bd395aa4465c89aa3175d59a1886294c78.zip | |
Merge branch 'peppe/common_test/failing_telnet_tests' into maint
* peppe/common_test/failing_telnet_tests:
Add documentation and make get_data behaviour backwards compatible
Introduce polling feature in ct_telnet
Fix problem with invalid timeouts because of truncated floats
OTP-12627
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/ct_telnet_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl index 84e69c2b54..62cb821ede 100644 --- a/lib/common_test/test/ct_telnet_SUITE.erl +++ b/lib/common_test/test/ct_telnet_SUITE.erl @@ -203,7 +203,9 @@ telnet_config(_, LogType) -> {command_timeout,10000}, {reconnection_attempts,0}, {reconnection_interval,0}, - {keep_alive,true}]} | + {keep_alive,true}, + {poll_limit,10}, + {poll_interval,1000}]} | if LogType == legacy -> [{ct_conn_log,[]}]; true -> |