diff options
| author | Hans Nilsson <[email protected]> | 2016-10-28 13:28:24 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-10-28 13:28:24 +0200 |
| commit | 284d4e244c6c4605c619cb44d807464bd5bc8f52 (patch) | |
| tree | afe4d231c8813c7dcfbfcf8a8cbb8f75c9b65222 /lib/ssh/test/ssh_test_lib.erl | |
| parent | 56627426e9a0ffb516a11ec2d4bd737c24fa3fd1 (diff) | |
| download | otp-284d4e244c6c4605c619cb44d807464bd5bc8f52.tar.gz otp-284d4e244c6c4605c619cb44d807464bd5bc8f52.tar.bz2 otp-284d4e244c6c4605c619cb44d807464bd5bc8f52.zip | |
ssh: change of test helper ssh_test_lib:start_shell
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
| -rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl index 6fd401d182..6c8fd95b2e 100644 --- a/lib/ssh/test/ssh_test_lib.erl +++ b/lib/ssh/test/ssh_test_lib.erl @@ -127,24 +127,19 @@ std_simple_exec(Host, Port, Config, Opts) -> ssh:close(ConnectionRef). -start_shell(Port, IOServer, UserDir) -> - start_shell(Port, IOServer, UserDir, []). - -start_shell(Port, IOServer, UserDir, Options) -> - spawn_link(?MODULE, init_shell, [Port, IOServer, [{user_dir, UserDir}|Options]]). - start_shell(Port, IOServer) -> - spawn_link(?MODULE, init_shell, [Port, IOServer, []]). - -init_shell(Port, IOServer, UserDir) -> - Host = hostname(), - Options = [{user_interaction, false}, {silently_accept_hosts, - true}] ++ UserDir, - group_leader(IOServer, self()), - loop_shell(Host, Port, Options). + start_shell(Port, IOServer, []). + +start_shell(Port, IOServer, ExtraOptions) -> + spawn_link( + fun() -> + Host = hostname(), + Options = [{user_interaction, false}, + {silently_accept_hosts,true} | ExtraOptions], + group_leader(IOServer, self()), + ssh:shell(Host, Port, Options) + end). -loop_shell(Host, Port, Options) -> - ssh:shell(Host, Port, Options). start_io_server() -> spawn_link(?MODULE, init_io_server, [self()]). |