aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-02-15 11:50:33 +0100
committerLukas Larsson <[email protected]>2011-02-17 17:42:40 +0100
commita342ded6e4ca90db3300a64a06d866b1e07484c7 (patch)
tree36279c344c4a6ec7cadf64dca8c09c29b50ee251
parentd1a2f287ee9059cb8f16e40c2808d98d09a74dd9 (diff)
downloadotp-a342ded6e4ca90db3300a64a06d866b1e07484c7.tar.gz
otp-a342ded6e4ca90db3300a64a06d866b1e07484c7.tar.bz2
otp-a342ded6e4ca90db3300a64a06d866b1e07484c7.zip
Update ftp suite to take config from ct:get_config
-rw-r--r--lib/inets/test/ftp_suite_lib.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index c539b7c17c..5ae0298b29 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -21,8 +21,8 @@
-module(ftp_suite_lib).
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("test_server/include/test_server_line.hrl").
-include("inets_test_lib.hrl").
%% Test server specific exports
@@ -74,7 +74,7 @@ tickets(suite) ->
ftpd_init(FtpdTag, Config) ->
%% Get the host name(s) of FTP server
Hosts =
- case ?config(ftpd_hosts, Config) of
+ case ct:get_config(ftpd_hosts) of
undefined ->
ftpd_hosts(data_dir(Config));
H ->
@@ -129,7 +129,7 @@ get_ftpd_host([Host|Hosts]) ->
dirty_select_ftpd_host(Config) ->
Hosts =
- case ?config(ftpd_hosts, Config) of
+ case ct:get_config(ftpd_hosts) of
undefined ->
ftpd_hosts(data_dir(Config));
H ->