diff options
| author | Hans Nilsson <[email protected]> | 2017-12-22 16:16:20 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-12-22 16:16:20 +0100 |
| commit | 0052a4641d6f904fe632a9c056b9eed7ffc18b54 (patch) | |
| tree | 006003792f2acbb2292b01ba9cabc18c21732b4d /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
| parent | 51fa0ae8543f65b7c3ef08eb49a53a0921c35972 (diff) | |
| parent | 0c08677522f1add0f6161328a0009e3ac3401f1e (diff) | |
| download | otp-0052a4641d6f904fe632a9c056b9eed7ffc18b54.tar.gz otp-0052a4641d6f904fe632a9c056b9eed7ffc18b54.tar.bz2 otp-0052a4641d6f904fe632a9c056b9eed7ffc18b54.zip | |
Merge branch 'maint'
* maint:
ssh: ssh_dbg updates
ssh: Better reports in some test case failures
ssh: Tests - timeout catches external ssh that does not disconnect
Diffstat (limited to 'lib/ssh/test/ssh_to_openssh_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 75d5b5e296..b20764ce47 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -27,7 +27,6 @@ %% Note: This directive should only be used in test suites. -compile(export_all). --define(TIMEOUT, 50000). -define(SSH_DEFAULT_PORT, 22). -define(REKEY_DATA_TMO, 65000). @@ -69,7 +68,7 @@ init_per_suite(Config) -> ?CHECK_CRYPTO( case gen_tcp:connect("localhost", 22, []) of {error,econnrefused} -> - {skip,"No openssh deamon"}; + {skip,"No openssh deamon (econnrefused)"}; _ -> ssh_test_lib:openssh_sanity_check(Config) end |