diff options
| author | Erlang/OTP <[email protected]> | 2016-07-23 10:43:05 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-07-23 10:43:05 +0200 |
| commit | e59dd4708bdb7d868bf31da9d0a3024218f3f8f8 (patch) | |
| tree | f1dcf68d28c2b8753e021fc7c69cda6266965d8a /lib/common_test/src/ct_gen_conn.erl | |
| parent | f98d9839113030e144bc2607b5f2bb0e61105dbd (diff) | |
| parent | dbb3b87a74992ca5e3e678ba747ccea6411c3f57 (diff) | |
| download | otp-e59dd4708bdb7d868bf31da9d0a3024218f3f8f8.tar.gz otp-e59dd4708bdb7d868bf31da9d0a3024218f3f8f8.tar.bz2 otp-e59dd4708bdb7d868bf31da9d0a3024218f3f8f8.zip | |
Merge branch 'peppe/ct_telnet_duplicated_lines/OTP-13730' into maint-18
* peppe/ct_telnet_duplicated_lines/OTP-13730:
Fix error with duplicated printouts by ct_telnet:expect/3
Diffstat (limited to 'lib/common_test/src/ct_gen_conn.erl')
| -rw-r--r-- | lib/common_test/src/ct_gen_conn.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl index e46fd77383..e28c89ab1d 100644 --- a/lib/common_test/src/ct_gen_conn.erl +++ b/lib/common_test/src/ct_gen_conn.erl @@ -27,7 +27,7 @@ -export([start/4, stop/1, get_conn_pid/1, check_opts/1]). -export([call/2, call/3, return/2, do_within_time/2]). --export([log/3, start_log/1, cont_log/2, end_log/0]). +-export([log/3, start_log/1, cont_log/2, cont_log_no_timestamp/2, end_log/0]). %%---------------------------------------------------------------------- %% Exported types @@ -175,6 +175,14 @@ cont_log(Format,Args) -> log(cont_log,[Format,Args]). %%%----------------------------------------------------------------- +%%% @spec cont_log_no_timestamp(Format,Args) -> ok +%%% +%%% @doc Log activities on the current connection (tool-internal use only). +%%% @see ct_logs:cont_log/2 +cont_log_no_timestamp(Format,Args) -> + log(cont_log_no_timestamp,[Format,Args]). + +%%%----------------------------------------------------------------- %%% @spec end_log() -> ok %%% %%% @doc Log activities on the current connection (tool-internal use only). |