diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-26 11:38:45 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-26 11:38:45 +0200 |
| commit | 2c8eec6c20f7214d59d174516007065486f7173f (patch) | |
| tree | 6d20196732d808bd78a90ee2f72a7f13a3544bb6 /lib/ssh/test/ssh_basic_SUITE.erl | |
| parent | 158b7744435e6f8500825b60f9002b5bf0639d6b (diff) | |
| parent | a06cd043eab256539459d765a4856fc156ed96d4 (diff) | |
| download | otp-2c8eec6c20f7214d59d174516007065486f7173f.tar.gz otp-2c8eec6c20f7214d59d174516007065486f7173f.tar.bz2 otp-2c8eec6c20f7214d59d174516007065486f7173f.zip | |
Merge branch 'ia/ssh/shutdown-bug' into maint
* ia/ssh/shutdown-bug:
ssh:close/1 will no longer crash if ssl manager already happens to have been terminated.
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 012367a6df..d66214d415 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -110,7 +110,8 @@ all() -> {group, rsa_pass_key}, {group, internal_error}, daemon_already_started, - server_password_option, server_userpassword_option]. + server_password_option, server_userpassword_option, + close]. groups() -> [{dsa_key, [], [exec, exec_compressed, shell, known_hosts]}, @@ -507,7 +508,34 @@ internal_error(Config) when is_list(Config) -> {user_dir, UserDir}, {user_interaction, false}]). +%%-------------------------------------------------------------------- +close(doc) -> + ["Simulate that we try to close an already closed connection"]; + +close(suite) -> + []; + +close(Config) when is_list(Config) -> + SystemDir = ?config(data_dir, Config), + PrivDir = ?config(priv_dir, Config), + UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth + file:make_dir(UserDir), + + {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir}, + {user_dir, UserDir}, + {user_passwords, [{"vego", "morot"}]}, + {failfun, fun ssh_test_lib:failfun/2}]), + {ok, CM} = ssh:connect(Host, Port, [{silently_accept_hosts, true}, + {user_dir, UserDir}, + {user, "vego"}, + {password, "morot"}, + {user_interaction, false}]), + exit(CM, {shutdown, normal}), + ok = ssh:close(CM). + + + %%-------------------------------------------------------------------- %% Internal functions %%-------------------------------------------------------------------- |