From bdbb8bfdfb653f4394c7440e0c7d081599c86ddc Mon Sep 17 00:00:00 2001 From: Peter Andersson Date: Mon, 2 May 2016 14:55:54 +0200 Subject: Update the reference manual OTP-13462 --- lib/common_test/doc/src/ct_telnet.xml | 5 ++++- lib/common_test/doc/src/unix_telnet.xml | 3 ++- lib/common_test/src/ct_telnet.erl | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml index b7ba352104..1de278d30c 100644 --- a/lib/common_test/doc/src/ct_telnet.xml +++ b/lib/common_test/doc/src/ct_telnet.xml @@ -64,6 +64,8 @@ remaining string terminated) = 0

Polling interval (sleep time between polls) = 1 second

+

The TCP_NODELAY option for the telnet socket + is disabled (set to false) per default

These parameters can be modified by the user with the following @@ -76,7 +78,8 @@ {reconnection_interval,Millisec}, {keep_alive,Bool}, {poll_limit,N}, - {poll_interval,Millisec}]}. + {poll_interval,Millisec}, + {tcp_nodelay,Bool}]}.

Millisec = integer(), N = integer()

diff --git a/lib/common_test/doc/src/unix_telnet.xml b/lib/common_test/doc/src/unix_telnet.xml index 189379c39a..a064a222d6 100644 --- a/lib/common_test/doc/src/unix_telnet.xml +++ b/lib/common_test/doc/src/unix_telnet.xml @@ -80,7 +80,7 @@ - connect(ConnName, Ip, Port, Timeout, KeepAlive, Extra) -> {ok, Handle} | {error, Reason} + connect(ConnName, Ip, Port, Timeout, KeepAlive, TCPNoDelay, Extra) -> {ok, Handle} | {error, Reason} Callback for ct_telnet.erl. ConnName = target_name() @@ -88,6 +88,7 @@ Port = integer() Timeout = integer() KeepAlive = bool() + TCPNoDelay = bool() Extra = target_name() | {Username, Password} Username = string() Password = string() diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl index cdc08fd9d4..f5f4f648f4 100644 --- a/lib/common_test/src/ct_telnet.erl +++ b/lib/common_test/src/ct_telnet.erl @@ -43,7 +43,7 @@ %% {keep_alive,Bool}, %% {poll_limit,N}, %% {poll_interval,Millisec}, -%% {tcp_nodelay,Bool]}. +%% {tcp_nodelay,Bool}]}. %%

Millisec = integer(), N = integer()

%%

Enter the telnet_settings term in a configuration %% file included in the test and ct_telnet will retrieve the information -- cgit v1.2.3