diff options
| author | Peter Andersson <[email protected]> | 2014-03-19 16:25:03 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-03-19 16:25:12 +0100 |
| commit | 57a9bc4c710690d1c7b219a9cd53b8cecbe6851e (patch) | |
| tree | 1f193e14947d1ad950bc71ac71f3231e4bc51f53 /lib/common_test/src/unix_telnet.erl | |
| parent | 392a7451ea6d4f1518a446186f35574d7936a718 (diff) | |
| parent | 5667601be38a2e35fbbe59491f448f947bfcc73c (diff) | |
| download | otp-57a9bc4c710690d1c7b219a9cd53b8cecbe6851e.tar.gz otp-57a9bc4c710690d1c7b219a9cd53b8cecbe6851e.tar.bz2 otp-57a9bc4c710690d1c7b219a9cd53b8cecbe6851e.zip | |
Merge remote branch 'origin/peppe/common_test/telnet_logging_final'
* origin/peppe/common_test/telnet_logging_final:
Add test cases and fix some problems with logging and with the telnet client
Get ct_telnet_client to print all data from server to log
Change telnet logging behaviour
OTP-11690
Diffstat (limited to 'lib/common_test/src/unix_telnet.erl')
| -rw-r--r-- | lib/common_test/src/unix_telnet.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/unix_telnet.erl b/lib/common_test/src/unix_telnet.erl index e049c3bf39..b05386a5ab 100644 --- a/lib/common_test/src/unix_telnet.erl +++ b/lib/common_test/src/unix_telnet.erl @@ -109,7 +109,7 @@ connect(ConnName,Ip,Port,Timeout,KeepAlive,Extra) -> connect1(Name,Ip,Port,Timeout,KeepAlive,Username,Password) -> start_gen_log("unix_telnet connect"), Result = - case ct_telnet_client:open(Ip,Port,Timeout,KeepAlive) of + case ct_telnet_client:open(Ip,Port,Timeout,KeepAlive,Name) of {ok,Pid} -> case ct_telnet:silent_teln_expect(Name,Pid,[], [prompt],?prx,[]) of @@ -143,13 +143,13 @@ connect1(Name,Ip,Port,Timeout,KeepAlive,Username,Password) -> {ok,[{prompt,_OtherPrompt1},{prompt,_OtherPrompt2}],_} -> {ok,Pid}; Error -> - log(Name,error, + log(Name,conn_error, "Did not get expected prompt from ~p:~p\n~p\n", [Ip,Port,Error]), {error,Error} end; Error -> - log(Name,error, + log(Name,conn_error, "Could not open telnet connection to ~p:~p\n~p\n", [Ip,Port,Error]), Error |