diff options
author | Hans Nilsson <[email protected]> | 2015-12-22 09:30:58 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-12-22 09:30:58 +0100 |
commit | 76bfd2ad384ed609949809c0c79605d915f6011e (patch) | |
tree | d46e71bd5f33f9eb1feba93ecea83f6e287dc821 /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
parent | c1fb23c857c0bbb6d3fd43952930f8e4e27594c1 (diff) | |
parent | 573552e7c6df1bc828385ff918b1ad1965463ba2 (diff) | |
download | otp-76bfd2ad384ed609949809c0c79605d915f6011e.tar.gz otp-76bfd2ad384ed609949809c0c79605d915f6011e.tar.bz2 otp-76bfd2ad384ed609949809c0c79605d915f6011e.zip |
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests:
ssh: add econnaborted to disconnect msgs in test suite
ssh: fix the check that open-ssh supports certain pubkeys in a test suite
Diffstat (limited to 'lib/ssh/test/ssh_to_openssh_SUITE.erl')
-rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 02cc79e4d5..67a61d3c11 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -110,9 +110,9 @@ end_per_testcase(_TestCase, _Config) -> chk_key(Pgm, Name, File, Config) -> case ssh_test_lib:openssh_supports(Pgm, public_key, Name) of - true -> - {skip,lists:concat(["openssh client does not support ",Name])}; false -> + {skip,lists:concat(["openssh client does not support ",Name])}; + true -> {ok,[[Home]]} = init:get_argument(home), KeyFile = filename:join(Home, File), case file:read_file(KeyFile) of |