diff options
| author | Peter Andersson <[email protected]> | 2013-06-04 16:10:09 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-06-04 16:13:40 +0200 |
| commit | cf68fec61294194b47063d2368ff916964e8644d (patch) | |
| tree | 9501c9abe4a2fa3715ff58210815356f829ac390 /lib/common_test/src/ct_ftp.erl | |
| parent | f7f24a77e918eea712b435a5ae9b01de270d6d7d (diff) | |
| parent | a1cc5adde3b289282dd5bfc7592a044d988c75a9 (diff) | |
| download | otp-cf68fec61294194b47063d2368ff916964e8644d.tar.gz otp-cf68fec61294194b47063d2368ff916964e8644d.tar.bz2 otp-cf68fec61294194b47063d2368ff916964e8644d.zip | |
Merge remote branch 'origin/peppe/common_test/ct_conn_handling' into maint
* origin/peppe/common_test/ct_conn_handling:
Add test suite
Fix faulty connection handling
OTP-10126
Diffstat (limited to 'lib/common_test/src/ct_ftp.erl')
| -rw-r--r-- | lib/common_test/src/ct_ftp.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl index 8790393b36..b91a521bd4 100644 --- a/lib/common_test/src/ct_ftp.erl +++ b/lib/common_test/src/ct_ftp.erl @@ -348,10 +348,10 @@ terminate(FtpPid,State) -> get_handle(Pid) when is_pid(Pid) -> {ok,Pid}; get_handle(Name) -> - case ct_util:get_connections(Name,?MODULE) of - {ok,[{Pid,_}|_]} -> + case ct_util:get_connection(Name,?MODULE) of + {ok,{Pid,_}} -> {ok,Pid}; - {ok,[]} -> + {error,no_registered_connection} -> open(Name); Error -> Error |