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_ftp.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_ftp.erl')
-rw-r--r-- | lib/common_test/src/ct_ftp.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl index 5db73066a3..d1d511f137 100644 --- a/lib/common_test/src/ct_ftp.erl +++ b/lib/common_test/src/ct_ftp.erl @@ -66,6 +66,7 @@ %%% {unix,[{ftp,IpAddr}, %%% {username,Username}, %%% {password,Password}]}.</pre> +%%% @see ct:require/3 put(KeyOrName,LocalFile,RemoteFile) -> Fun = fun(Ftp) -> send(Ftp,LocalFile,RemoteFile) end, open_and_do(KeyOrName,Fun). @@ -85,6 +86,7 @@ put(KeyOrName,LocalFile,RemoteFile) -> %%% %%% <p>The config file must be as for put/3.</p> %%% @see put/3 +%%% @see ct:require/3 get(KeyOrName,RemoteFile,LocalFile) -> Fun = fun(Ftp) -> recv(Ftp,RemoteFile,LocalFile) end, open_and_do(KeyOrName,Fun). @@ -105,6 +107,10 @@ get(KeyOrName,RemoteFile,LocalFile) -> %%% simply use <code>Key</code>, the configuration variable name, to %%% specify the target. Note that a connection that has no associated target %%% name can only be closed with the handle value.</p> +%%% +%%% <p>See <c>ct:require/3</c> for how to create a new <c>Name</c></p> +%%% +%%% @see ct:require/3 open(KeyOrName) -> case ct_util:get_key_from_name(KeyOrName) of {ok,node} -> |