diff options
| author | Hans Nilsson <[email protected]> | 2015-12-22 09:31:46 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-12-22 09:31:46 +0100 |
| commit | 2a729798aacfc7ce0e718d3b52e4915223a13e03 (patch) | |
| tree | c3642afae0c4ecf29ec3b2012f19343e99e45b37 /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
| parent | f7dabb38a90382bb1d0988468aaaa03dd7223038 (diff) | |
| parent | 76bfd2ad384ed609949809c0c79605d915f6011e (diff) | |
| download | otp-2a729798aacfc7ce0e718d3b52e4915223a13e03.tar.gz otp-2a729798aacfc7ce0e718d3b52e4915223a13e03.tar.bz2 otp-2a729798aacfc7ce0e718d3b52e4915223a13e03.zip | |
Merge branch 'maint'
* maint:
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 |