diff options
author | Peter Andersson <[email protected]> | 2014-01-30 09:47:46 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2014-01-30 09:50:28 +0100 |
commit | 30634c48a18f1b79d27083418ac44b90fd68c437 (patch) | |
tree | af43ea1bc1d811c1d6360108654690616b5f6fd2 /lib/common_test/src/ct_gen_conn.erl | |
parent | a6aacc6614a09347f2f883ee082c90742e48f5e3 (diff) | |
parent | 47a9a27ef366474bd0a1f404f81df8359b968a36 (diff) | |
download | otp-30634c48a18f1b79d27083418ac44b90fd68c437.tar.gz otp-30634c48a18f1b79d27083418ac44b90fd68c437.tar.bz2 otp-30634c48a18f1b79d27083418ac44b90fd68c437.zip |
Merge branch 'peppe/common_test/telnet_logging_system'
* peppe/common_test/telnet_logging_system:
Add verification terms for the unix_telnet test case
Add documentation about logging in the ct_telnet module
Make temporary fix of problem that sometimes causes the ct_util server to die
Fix remaining problems using raw telnet logging for parallel test cases
Make it possible to use raw telnet logs in parallel test case groups
Implement tests for logging traffic for multiple telnet connections
Add and improve test cases
Implement new telnet logging system
OTP-11440
Diffstat (limited to 'lib/common_test/src/ct_gen_conn.erl')
-rw-r--r-- | lib/common_test/src/ct_gen_conn.erl | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl index a5b736136f..078d6b1a44 100644 --- a/lib/common_test/src/ct_gen_conn.erl +++ b/lib/common_test/src/ct_gen_conn.erl @@ -29,6 +29,13 @@ -export([start/4, stop/1, get_conn_pid/1]). -export([call/2, call/3, return/2, do_within_time/2]). +%%---------------------------------------------------------------------- +%% Exported types +%%---------------------------------------------------------------------- +-export_type([server_id/0, + target_name/0, + key_or_name/0]). + -ifdef(debug). -define(dbg,true). -else. @@ -47,6 +54,18 @@ cb_state, ct_util_server}). +%%------------------------------------------------------------------ +%% Type declarations +%%------------------------------------------------------------------ +-type server_id() :: atom(). +%% A `ServerId' which exists in a configuration file. +-type target_name() :: atom(). +%% A name which is associated to a `server_id()' via a +%% `require' statement or a call to {@link ct:require/2} in the +%% test suite. +-type key_or_name() :: server_id() | target_name(). + + %%%----------------------------------------------------------------- %%% @spec start(Address,InitData,CallbackMod,Opts) -> %%% {ok,Handle} | {error,Reason} |