diff options
| author | Peter Andersson <[email protected]> | 2014-04-03 10:13:16 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-04-03 10:13:16 +0200 |
| commit | 4f01844fc9feda7366c2995fa87bbbf862ea7e69 (patch) | |
| tree | 2815738f6198d3176e467f70c812bb268a187bff /lib/common_test/test/ct_telnet_SUITE.erl | |
| parent | a6f1a39b615885c2ee4cef53c2deaa996aad3f78 (diff) | |
| parent | 3fab0d4b7c7fc39cc5b92dd7f19743780ccd20b5 (diff) | |
| download | otp-4f01844fc9feda7366c2995fa87bbbf862ea7e69.tar.gz otp-4f01844fc9feda7366c2995fa87bbbf862ea7e69.tar.bz2 otp-4f01844fc9feda7366c2995fa87bbbf862ea7e69.zip | |
Merge branch 'peppe/common_test/otp_17_doc'
* peppe/common_test/otp_17_doc:
Document the abort_if_missing_suites functionality
Document changes in the CT hooks API and the event message protocol
Document new ct_telnet logging features
Diffstat (limited to 'lib/common_test/test/ct_telnet_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_telnet_SUITE.erl | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl index f5cff76fd1..84e69c2b54 100644 --- a/lib/common_test/test/ct_telnet_SUITE.erl +++ b/lib/common_test/test/ct_telnet_SUITE.erl @@ -180,14 +180,20 @@ telnet_config(unix_telnet, legacy) -> {ct_conn_log,[]}]; %% LogType same as GroupName telnet_config(unix_telnet, LogType) -> + LogTypeTerm = if LogType == raw -> []; + true -> [{log_type,LogType}] + end, [{unix, ct:get_config(unix)}, {ct_conn_log, - [{ct_telnet,[{log_type,LogType}, - {hosts,[telnet_server_conn1, - telnet_server_conn2, - telnet_server_conn3, - telnet_server_conn4]}]}]}]; + [{ct_telnet, LogTypeTerm ++ + [{hosts,[telnet_server_conn1, + telnet_server_conn2, + telnet_server_conn3, + telnet_server_conn4]}]}]}]; telnet_config(_, LogType) -> + LogTypeTerm = if LogType == raw -> []; + true -> [{log_type,LogType}] + end, [{unix,[{telnet,"localhost"}, {port, ?erl_telnet_server_port}, {username,?erl_telnet_server_user}, @@ -202,11 +208,11 @@ telnet_config(_, LogType) -> [{ct_conn_log,[]}]; true -> [{ct_conn_log, - [{ct_telnet,[{log_type,LogType}, - {hosts,[telnet_server_conn1, - telnet_server_conn2, - telnet_server_conn3, - telnet_server_conn4]}]}]}] + [{ct_telnet, LogTypeTerm ++ + [{hosts,[telnet_server_conn1, + telnet_server_conn2, + telnet_server_conn3, + telnet_server_conn4]}]}]}] end]. %%%----------------------------------------------------------------- |