diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-03-24 18:58:46 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-04-29 12:43:13 +0200 |
| commit | fb584c520ef60845506a14cb910745ffc3b92a66 (patch) | |
| tree | 916ab42b9ba7b2f61aa833fdcbb664c1d8d03bf7 /lib/ssh/test/ssh_connection_SUITE.erl | |
| parent | b3ad09ba107de16259844fe5bc50898ae40a1a96 (diff) | |
| download | otp-fb584c520ef60845506a14cb910745ffc3b92a66.tar.gz otp-fb584c520ef60845506a14cb910745ffc3b92a66.tar.bz2 otp-fb584c520ef60845506a14cb910745ffc3b92a66.zip | |
ssh: Add openSSH interop check
Diffstat (limited to 'lib/ssh/test/ssh_connection_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_connection_SUITE.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl index c9441a46b0..6fc09876ad 100644 --- a/lib/ssh/test/ssh_connection_SUITE.erl +++ b/lib/ssh/test/ssh_connection_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2014. All Rights Reserved. +%% Copyright Ericsson AB 2008-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -76,12 +76,13 @@ end_per_suite(_Config) -> crypto:stop(). %%-------------------------------------------------------------------- -init_per_group(openssh, _Config) -> +init_per_group(openssh, Config) -> case gen_tcp:connect("localhost", 22, []) of {error,econnrefused} -> {skip,"No openssh deamon"}; {ok, Socket} -> - gen_tcp:close(Socket) + gen_tcp:close(Socket), + ssh_test_lib:openssh_sanity_check(Config) end; init_per_group(_, Config) -> Config. @@ -93,7 +94,7 @@ end_per_group(_, Config) -> init_per_testcase(_TestCase, Config) -> %% To make sure we start clean as it is not certain that %% end_per_testcase will be run! - ssh:stop(), + end_per_testcase(Config), ssh:start(), Config. |