diff options
| author | Hans Nilsson <[email protected]> | 2015-12-08 11:52:09 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-12-08 11:52:09 +0100 |
| commit | 5fe8d649b1431d84d559e6c3730de25b54dbde31 (patch) | |
| tree | 04b30751d0d847378b6cebfdbe84034edf613ff2 /lib/ssh/test/ssh_basic_SUITE.erl | |
| parent | dbe8fe945aaf26809b288d33dd100ed83f6984e4 (diff) | |
| parent | 7061105f5a8458486d43183a8b925c203b7a21fe (diff) | |
| download | otp-5fe8d649b1431d84d559e6c3730de25b54dbde31.tar.gz otp-5fe8d649b1431d84d559e6c3730de25b54dbde31.tar.bz2 otp-5fe8d649b1431d84d559e6c3730de25b54dbde31.zip | |
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests:
ssh: add econnaborted as correct tcp disconnect reason in testcase
ssh: add check for available ipv6 addr in test case
ssh: Add testcase precondition
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 85a6bac972..6c4c215b3d 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -311,6 +311,14 @@ init_per_testcase(TC, Config) when TC==shell_no_unicode ; ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p", [file:native_name_encoding(),io:getopts()]), wait_for_erlang_first_line([{io,IO}, {shell,Shell}, {sftpd, Sftpd} | Config]); + +init_per_testcase(inet6_option, Config) -> + case ssh_test_lib:has_inet6_address() of + true -> + init_per_testcase('__default__', Config); + false -> + {skip,"No ipv6 interface address"} + end; init_per_testcase(_TestCase, Config) -> ssh:start(), Config. |