ssh: change of test helper ssh_test_lib:start_shell

3 files changed, 23 insertions, 28 deletions

diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index b102ede1cb..0a0ab5cdf7 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -315,9 +315,9 @@ init_per_testcase(TC, Config) when TC==shell_no_unicode ;
 			     {user_passwords, [{"foo", "bar"}]}]),
     ct:sleep(500),
     IO = ssh_test_lib:start_io_server(),
-    Shell = ssh_test_lib:start_shell(Port, IO, UserDir,
-				     [{silently_accept_hosts, true},
-				      {user,"foo"},{password,"bar"}]),
+    Shell = ssh_test_lib:start_shell(Port, IO, [{user_dir,UserDir},
+						{silently_accept_hosts, true},
+						{user,"foo"},{password,"bar"}]),
     ct:log("IO=~p, Shell=~p, self()=~p",[IO,Shell,self()]),
     ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
 	   [file:native_name_encoding(),io:getopts()]),
@@ -525,7 +525,7 @@ shell(Config) when is_list(Config) ->
     ct:sleep(500),
 
     IO = ssh_test_lib:start_io_server(),
-    Shell = ssh_test_lib:start_shell(Port, IO, UserDir),
+    Shell = ssh_test_lib:start_shell(Port, IO, [{user_dir,UserDir}]),
     receive
 	{'EXIT', _, _} ->
 	    ct:fail(no_ssh_connection);  
@@ -563,10 +563,10 @@ exec_key_differs(Config, UserPKAlgs) ->
 	    ct:sleep(500),
 
 	    IO = ssh_test_lib:start_io_server(),
-	    Shell = ssh_test_lib:start_shell(Port, IO, UserDir,
-					     [{preferred_algorithms,[{public_key,['ssh-rsa']}]},
-					      {pref_public_key_algs,UserPKAlgs}
-					     ]),
+	    Shell = ssh_test_lib:start_shell(Port, IO, [{user_dir,UserDir},
+							{preferred_algorithms,[{public_key,['ssh-rsa']}]},
+							{pref_public_key_algs,UserPKAlgs}
+						       ]),
 
 
 	    receive
@@ -597,9 +597,9 @@ exec_key_differs_fail(Config) when is_list(Config) ->
     ct:sleep(500),
 
     IO = ssh_test_lib:start_io_server(),
-    ssh_test_lib:start_shell(Port, IO, UserDir,
-			     [{preferred_algorithms,[{public_key,['ssh-rsa']}]},
-			      {pref_public_key_algs,['ssh-dss']}]),
+    ssh_test_lib:start_shell(Port, IO, [{user_dir,UserDir},
+					{preferred_algorithms,[{public_key,['ssh-rsa']}]},
+					{pref_public_key_algs,['ssh-dss']}]),
     receive
 	{'EXIT', _, _} ->
 	    ok;  
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 9b1ff65e64..60eae5a850 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -1011,7 +1011,7 @@ ssh_connect_nonegtimeout_connected(Config, Parallel) ->
     ct:sleep(500),
 
     IO = ssh_test_lib:start_io_server(),
-    Shell = ssh_test_lib:start_shell(Port, IO, UserDir),
+    Shell = ssh_test_lib:start_shell(Port, IO, [{user_dir,UserDir}]),
     receive
 	Error = {'EXIT', _, _} ->
 	    ct:log("~p",[Error]),
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()]).