diff options
| author | Hans Nilsson <[email protected]> | 2017-04-07 10:20:29 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-04-07 10:20:29 +0200 |
| commit | 90aacace4bdb1c883c3829bc66c1c616a81943d9 (patch) | |
| tree | 37f2957737075a567d05412e9ff0156a88c6182e /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | d88d2cd8e9c50122923adc8b17904664f6360528 (diff) | |
| parent | 4d6393bc4df58defbc22c5d97e28bbfdd8794fc6 (diff) | |
| download | otp-90aacace4bdb1c883c3829bc66c1c616a81943d9.tar.gz otp-90aacace4bdb1c883c3829bc66c1c616a81943d9.tar.bz2 otp-90aacace4bdb1c883c3829bc66c1c616a81943d9.zip | |
Merge branch 'hans/ssh/refactor_ssh/OTP-14264'
Also enables tuple IP-addresses in ssh:connect et al. OTP-14243
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index b167f98ac8..673fb54a4f 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -151,8 +151,8 @@ init_per_testcase(TestCase, Config) -> SubSystems = [ssh_sftpd:subsystem_spec([])], ssh:daemon(0, [{subsystems, SubSystems}|Options]) end, - {ok,Dinf} = ssh:daemon_info(Sftpd), - Port = proplists:get_value(port, Dinf), + + Port = ssh_test_lib:daemon_port(Sftpd), Cm = ssh_test_lib:connect(Port, [{user_dir, ClientUserDir}, @@ -187,7 +187,7 @@ init_per_testcase(TestCase, Config) -> [{sftp, {Cm, Channel}}, {sftpd, Sftpd }| Config]. end_per_testcase(_TestCase, Config) -> - ssh_sftpd:stop(proplists:get_value(sftpd, Config)), + catch ssh:stop_daemon(proplists:get_value(sftpd, Config)), {Cm, Channel} = proplists:get_value(sftp, Config), ssh_connection:close(Cm, Channel), ssh:close(Cm), |