diff options
| author | Péter Dimitrov <[email protected]> | 2018-03-29 14:50:44 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-29 14:50:44 +0200 |
| commit | 23aca6a62a6d264a460668aa569c9078438b580e (patch) | |
| tree | 1cb329fff82190adc0220d8ff58224681a2c67df /lib/common_test | |
| parent | f2fc2178ffad5fb890b4cc8ae0d44e3096c98103 (diff) | |
| parent | 69a8c892675884f46381a463d8ec81343f0af646 (diff) | |
| download | otp-23aca6a62a6d264a460668aa569c9078438b580e.tar.gz otp-23aca6a62a6d264a460668aa569c9078438b580e.tar.bz2 otp-23aca6a62a6d264a460668aa569c9078438b580e.zip | |
Merge pull request #1765 from peterdmv/split_inets/OTP-14113
Split inets OTP-14113
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/doc/src/ct_ftp.xml | 6 | ||||
| -rw-r--r-- | lib/common_test/src/common_test.app.src | 1 | ||||
| -rw-r--r-- | lib/common_test/src/ct_ftp.erl | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/lib/common_test/doc/src/ct_ftp.xml b/lib/common_test/doc/src/ct_ftp.xml index e8c6f72db7..a6f01dd58e 100644 --- a/lib/common_test/doc/src/ct_ftp.xml +++ b/lib/common_test/doc/src/ct_ftp.xml @@ -33,13 +33,11 @@ <file>ct_ftp.xml</file> </header> <module>ct_ftp</module> - <modulesummary>FTP client module (based on the FTP support of the Inets - application).</modulesummary> + <modulesummary>FTP client module (based on the FTP application).</modulesummary> <description> - <p>FTP client module (based on the FTP support of the <c>Inets</c> - application).</p> + <p>FTP client module (based on the <c>ftp</c> application).</p> </description> diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src index 9becde110b..f686003637 100644 --- a/lib/common_test/src/common_test.app.src +++ b/lib/common_test/src/common_test.app.src @@ -85,6 +85,7 @@ "crypto-3.6", "debugger-4.1", "erts-7.0", + "ftp-1.0.0", "inets-6.0", "kernel-4.0", "observer-2.1", diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl index ee4a6a6c45..8b02ae3a0f 100644 --- a/lib/common_test/src/ct_ftp.erl +++ b/lib/common_test/src/ct_ftp.erl @@ -18,7 +18,7 @@ %% %CopyrightEnd% %% -%%% @doc FTP client module (based on the FTP support of the INETS application). +%%% @doc FTP client module (based on the FTP application). %%% %%% @type connection() = handle() | ct:target_name() %%% @type handle() = ct_gen_conn:handle(). Handle for a specific @@ -292,8 +292,8 @@ init(KeyOrName,{IP,Port},{Username,Password}) -> end. ftp_connect(IP,Port,Username,Password) -> - _ = inets:start(), - case inets:start(ftpc,[{host,IP},{port,Port}]) of + _ = ftp:start(), + case ftp:start_service([{host,IP},{port,Port}]) of {ok,FtpPid} -> case ftp:user(FtpPid,Username,Password) of ok -> @@ -341,7 +341,7 @@ reconnect(_Addr,_State) -> terminate(FtpPid,State) -> log(heading(terminate,State#state.target_name), "Closing FTP connection.\nHandle: ~p\n",[FtpPid]), - inets:stop(ftpc,FtpPid). + ftp:stop_service(FtpPid). %%%================================================================= |