diff options
author | Hans Nilsson <[email protected]> | 2018-02-22 17:00:30 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-02-28 17:08:41 +0100 |
commit | b9d8918e6dade84e77c01ceab0e12e9c55266cf3 (patch) | |
tree | b51516c11e0d9b8a1e65122b3a4b7e1b2d7f634a /lib/ssh | |
parent | 4f88d07a757d4deef6c8a40db11f962e74d3a8c5 (diff) | |
download | otp-b9d8918e6dade84e77c01ceab0e12e9c55266cf3.tar.gz otp-b9d8918e6dade84e77c01ceab0e12e9c55266cf3.tar.bz2 otp-b9d8918e6dade84e77c01ceab0e12e9c55266cf3.zip |
ssh: Insert missing ssh:stop() etc in test suites
Diffstat (limited to 'lib/ssh')
-rw-r--r-- | lib/ssh/test/ssh_compat_SUITE.erl | 1 | ||||
-rw-r--r-- | lib/ssh/test/ssh_connection_SUITE.erl | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_compat_SUITE.erl b/lib/ssh/test/ssh_compat_SUITE.erl index 82b83dd83d..f7eda1dc08 100644 --- a/lib/ssh/test/ssh_compat_SUITE.erl +++ b/lib/ssh/test/ssh_compat_SUITE.erl @@ -92,6 +92,7 @@ end_per_suite(Config) -> %%% os:cmd("docker rm $(docker ps -aq -f status=exited)"), %% Remove dangling images: %%% os:cmd("docker rmi $(docker images -f dangling=true -q)"), + catch ssh:stop(), Config. diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl index ba4518cfe6..77c299b3ee 100644 --- a/lib/ssh/test/ssh_connection_SUITE.erl +++ b/lib/ssh/test/ssh_connection_SUITE.erl @@ -85,6 +85,7 @@ init_per_suite(Config) -> ?CHECK_CRYPTO(Config). end_per_suite(Config) -> + catch ssh:stop(), Config. %%-------------------------------------------------------------------- @@ -800,6 +801,8 @@ stop_listener(Config) when is_list(Config) -> ssh:stop_daemon(Pid0), ssh:stop_daemon(Pid1); Error -> + ssh:close(ConnectionRef0), + ssh:stop_daemon(Pid0), ct:fail({unexpected, Error}) end. |