aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-02 09:14:44 +0200
committerFredrik Gustafsson <[email protected]>2013-05-02 09:14:44 +0200
commit49edd0102919a1dcf673cb34634fb89fa55f505a (patch)
treeac3daa74ae4b3f9cec72fc05480495276ea69fd4
parented1bbb32e7030644e29fea79316b380a658b3605 (diff)
parentcd14a151051567cc19dfa3677799612366060801 (diff)
downloadotp-49edd0102919a1dcf673cb34634fb89fa55f505a.tar.gz
otp-49edd0102919a1dcf673cb34634fb89fa55f505a.tar.bz2
otp-49edd0102919a1dcf673cb34634fb89fa55f505a.zip
Merge branch 'maint'
-rw-r--r--lib/common_test/src/ct_telnet.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index beb3c1d649..bd74991859 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -29,7 +29,9 @@
%%% Command timeout = 10 sec (time to wait for a command to return)
%%% Max no of reconnection attempts = 3
%%% Reconnection interval = 5 sek (time to wait in between reconnection attempts)
-%%% Keep alive = true (will send NOP to the server every 10 sec if connection is idle)</pre>
+%%% Keep alive = true (will send NOP to the server every 10 sec if connection is idle)
+%%% Wait for linebreak = true (Will expect answer from server to end with linebreak when
+%%% using ct_telnet:expect)</pre>
%%% <p>These parameters can be altered by the user with the following
%%% configuration term:</p>
%%% <pre>
@@ -37,7 +39,8 @@
%%% {command_timeout,Millisec},
%%% {reconnection_attempts,N},
%%% {reconnection_interval,Millisec},
-%%% {keep_alive,Bool}]}.</pre>
+%%% {keep_alive,Bool},
+%% {wait_for_linebreak, Bool}]}.</pre>
%%% <p><code>Millisec = integer(), N = integer()</code></p>
%%% <p>Enter the <code>telnet_settings</code> term in a configuration
%%% file included in the test and ct_telnet will retrieve the information