diff options
author | Lukas Larsson <[email protected]> | 2012-08-09 18:00:13 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2012-08-23 16:18:53 +0200 |
commit | a71c6b976fa79fa3bcd0e61850a1a57071159b28 (patch) | |
tree | 0608f55c24792e551f4b0b3f291e062c46f24e4f /lib/common_test/src/ct_ssh.erl | |
parent | 064b42237d891d5fdcb6c1a351980b8291437618 (diff) | |
download | otp-a71c6b976fa79fa3bcd0e61850a1a57071159b28.tar.gz otp-a71c6b976fa79fa3bcd0e61850a1a57071159b28.tar.bz2 otp-a71c6b976fa79fa3bcd0e61850a1a57071159b28.zip |
Update user config to use nested tuple keys
ct:get_config and ct:require can now use nested tuples
to fetch data from user configuration. E.g.
ct:get_config({localhost,ip,v4}).
This introduces a backwards incompatability with how names
are associated with keys when using require/2. E.g.
ct:require(a_name,{localhost,ip}) will associate a_name with ip
instead of localhost.
Diffstat (limited to 'lib/common_test/src/ct_ssh.erl')
-rw-r--r-- | lib/common_test/src/ct_ssh.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_ssh.erl b/lib/common_test/src/ct_ssh.erl index aebb28bc42..21553f5551 100644 --- a/lib/common_test/src/ct_ssh.erl +++ b/lib/common_test/src/ct_ssh.erl @@ -136,7 +136,8 @@ connect(KeyOrName, ExtraOpts) when is_list(ExtraOpts) -> %%% associated with <code>Name</code>. If <code>Key</code> is %%% used, the returned handle must be used for subsequent calls %%% (multiple connections may be opened using the config -%%% data specified by <code>Key</code>).</p> +%%% data specified by <code>Key</code>). See <c>ct:require/3</c> +%%% for how to create a new <c>Name</c></p> %%% %%% <p><code>ConnType</code> will always override the type %%% specified in the address tuple in the configuration data (and @@ -152,6 +153,8 @@ connect(KeyOrName, ExtraOpts) when is_list(ExtraOpts) -> %%% The extra options will override any existing options with the %%% same key in the config data. For details on valid SSH %%% options, see the documentation for the OTP ssh application.</p> +%%% +%%% @see ct:require/3 connect(KeyOrName, ConnType, ExtraOpts) -> case ct:get_config(KeyOrName) of undefined -> |