diff options
author | Peter Andersson <[email protected]> | 2014-11-11 16:36:49 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2014-11-11 16:36:49 +0100 |
commit | 19f5722c9fb31ed88c45de1f17221941edaebd2f (patch) | |
tree | de78ae0fbe940cad28b5ca79c5b5395a8d636557 /lib/common_test/src/ct_telnet_client.erl | |
parent | 257c61347a270d8b837224e191c57b9e5b50c483 (diff) | |
parent | 2f9fdd45fa120fb535252a79c50ec64dbf1f9972 (diff) | |
download | otp-19f5722c9fb31ed88c45de1f17221941edaebd2f.tar.gz otp-19f5722c9fb31ed88c45de1f17221941edaebd2f.tar.bz2 otp-19f5722c9fb31ed88c45de1f17221941edaebd2f.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_telnet_client.erl')
-rw-r--r-- | lib/common_test/src/ct_telnet_client.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_telnet_client.erl b/lib/common_test/src/ct_telnet_client.erl index ce30dcb74b..3ae373e433 100644 --- a/lib/common_test/src/ct_telnet_client.erl +++ b/lib/common_test/src/ct_telnet_client.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2013. All Rights Reserved. +%% Copyright Ericsson AB 2003-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -35,7 +35,7 @@ %% -define(debug, true). -export([open/2, open/3, open/4, open/5, close/1]). --export([send_data/2, get_data/1]). +-export([send_data/2, send_data/3, get_data/1]). -define(TELNET_PORT, 23). -define(OPEN_TIMEOUT,10000). @@ -97,7 +97,11 @@ close(Pid) -> end. send_data(Pid, Data) -> - Pid ! {send_data, Data++"\n"}, + send_data(Pid, Data, true). +send_data(Pid, Data, true) -> + send_data(Pid, Data++"\n", false); +send_data(Pid, Data, false) -> + Pid ! {send_data, Data}, ok. get_data(Pid) -> |