aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_connection_SUITE.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-03-01 10:23:37 +0100
committerHans Nilsson <[email protected]>2018-03-01 10:23:37 +0100
commit9574395f47164982baf9c31258c696a7f950f582 (patch)
tree98e3d16318bd236bc216f9033fcdc5303deeeeeb /lib/ssh/test/ssh_connection_SUITE.erl
parent92c4f5db635d286f0ca81ecf9e095f1dcfa40754 (diff)
parentb9d8918e6dade84e77c01ceab0e12e9c55266cf3 (diff)
downloadotp-9574395f47164982baf9c31258c696a7f950f582.tar.gz
otp-9574395f47164982baf9c31258c696a7f950f582.tar.bz2
otp-9574395f47164982baf9c31258c696a7f950f582.zip
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests: ssh: Insert missing ssh:stop() etc in test suites ssh: Fix acceptor sup testcase ssh: Fix cli testcase ssh: Misspelling in test suite ssh: Put common user_dir setup in ssh_options_SUITE:init_per_testcases/2
Diffstat (limited to 'lib/ssh/test/ssh_connection_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_connection_SUITE.erl3
1 files changed, 3 insertions, 0 deletions
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.