Merge branch 'maint'

* maint:
  ssh: Removed testcases from ssh_to_openssh_SUITE
  ssh: test suites probes ssh client
  ssh: running ssh_algorithms_SUITE tests in parallel
  ssh: wait for subsystem exit in ssh_connection_SUITE:max_channels_option

5 files changed, 104 insertions, 279 deletions

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 9f388de2a7..2ab83d84e1 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
 	],
 
     AlgoTcSet =
-	[{Alg, [], specific_test_cases(Tag,Alg,SshcAlgos,SshdAlgos)}
+	[{Alg, [parallel], specific_test_cases(Tag,Alg,SshcAlgos,SshdAlgos)}
 	 || {Tag,Algs} <- ErlAlgos ++ DoubleAlgos,
 	    Alg <- Algs],
 
@@ -110,7 +110,8 @@ init_per_group(Group, Config) ->
 	    Config;
 	false ->
 	    %% An algorithm group
-	    [[{name,Tag}]|_] = ?config(tc_group_path, Config),
+	    Tag = proplists:get_value(name,
+				      hd(?config(tc_group_path, Config))),
 	    Alg = Group,
 	    PA =
 		case split(Alg) of
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index f0fdf5c0cc..1b93cc9c32 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -700,6 +700,16 @@ max_channels_option(Config) when is_list(Config) ->
     %%%---- close the shell
     ok = ssh_connection:send(ConnectionRef, ChannelId0, "exit().\n", 5000),
     
+    %%%---- wait for the subsystem to terminate
+    receive
+	{ssh_cm,ConnectionRef,{closed,ChannelId0}} -> ok
+    after 5000 ->
+	    ct:log("Timeout waiting for '{ssh_cm,~p,{closed,~p}}'~n"
+		   "Message queue:~n~p",
+		   [ConnectionRef,ChannelId0,erlang:process_info(self(),messages)]),
+	    ct:fail("exit Timeout",[])
+    end,
+
     %%%---- exec #3
     success = ssh_connection:exec(ConnectionRef, ChannelId5, "testing3.\n", infinity),
     receive
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index a269192785..2e63ec086b 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -478,7 +478,63 @@ check_ssh_client_support2(P) ->
 	    -1
     end.
 
-default_algorithms(Host, Port) ->
+%%%--------------------------------------------------------------------
+%%% Probe a server or a client about algorithm support
+
+default_algorithms(sshd) ->
+    default_algorithms(sshd, "localhost", 22);
+
+default_algorithms(sshc) ->
+    default_algorithms(sshc, []).
+
+default_algorithms(sshd, Host, Port) ->
+    try run_fake_ssh(
+	  ssh_trpt_test_lib:exec(
+	    [{connect,Host,Port, [{silently_accept_hosts, true},
+				  {user_interaction, false}]}]))
+    catch
+	_C:_E ->
+	    ct:pal("***~p:~p: ~p:~p",[?MODULE,?LINE,_C,_E]),
+	    []
+    end.
+
+default_algorithms(sshc, DaemonOptions) ->
+    Parent = self(),
+    %% Start a process handling one connection on the server side:
+    Srvr =
+	spawn_link(
+	  fun() ->
+		  Parent ! 
+		      {result, self(),
+		       try
+			   {ok,InitialState} = ssh_trpt_test_lib:exec(listen),
+			   Parent ! {hostport,self(),ssh_trpt_test_lib:server_host_port(InitialState)},
+			   run_fake_ssh(
+			     ssh_trpt_test_lib:exec([{accept, DaemonOptions}],
+						    InitialState))
+		       catch
+			   _C:_E ->
+			       ct:pal("***~p:~p: ~p:~p",[?MODULE,?LINE,_C,_E]),
+			       []
+		       end}
+	  end),
+   
+    receive
+	{hostport,Srvr,{_Host,Port}} ->
+	    spawn(fun()-> os:cmd(lists:concat(["ssh -o \"StrictHostKeyChecking no\" -p ",Port," localhost"])) end)
+    after ?TIMEOUT ->
+	    ct:fail("No server respons 1")
+    end,
+
+    receive
+	{result,Srvr,L} ->
+	    L
+    after ?TIMEOUT ->
+	    ct:fail("No server respons 2")
+    end.
+
+
+run_fake_ssh({ok,InitialState}) ->
     KexInitPattern =
 	#ssh_msg_kexinit{
 	   kex_algorithms = '$kex_algorithms',
@@ -491,61 +547,35 @@ default_algorithms(Host, Port) ->
 	   compression_algorithms_server_to_client = '$compression_algorithms_server_to_client',
 	   _ = '_'
 	  },
+    {ok,E} = ssh_trpt_test_lib:exec([{set_options,[silent]},
+				     {send, hello},
+				     receive_hello,
+				     {send, ssh_msg_kexinit},
+				     {match, KexInitPattern, receive_msg},
+				     close_socket
+				    ],
+				    InitialState),
+     [Kex, PubKey, EncC2S, EncS2C, MacC2S, MacS2C, CompC2S, CompS2C] =
+	ssh_trpt_test_lib:instantiate(['$kex_algorithms',
+				       '$server_host_key_algorithms',
+				       '$encryption_algorithms_client_to_server',
+				       '$encryption_algorithms_server_to_client',
+				       '$mac_algorithms_client_to_server',
+				       '$mac_algorithms_server_to_client',
+				       '$compression_algorithms_client_to_server',
+				       '$compression_algorithms_server_to_client'
+				      ], E),
+    [{kex, to_atoms(Kex)},
+     {public_key, to_atoms(PubKey)},
+     {cipher, [{client2server, to_atoms(EncC2S)},
+	       {server2client, to_atoms(EncS2C)}]},
+     {mac, [{client2server, to_atoms(MacC2S)},
+	    {server2client, to_atoms(MacS2C)}]},
+     {compression, [{client2server, to_atoms(CompC2S)},
+		    {server2client, to_atoms(CompS2C)}]}].
+    
 
-    try ssh_trpt_test_lib:exec(
-	   [{connect,Host,Port, [{silently_accept_hosts, true},
-				 {user_interaction, false}]},
-	    {send,hello},
-	    receive_hello, 
-	    {send, ssh_msg_kexinit},
-	    {match, KexInitPattern, receive_msg},
-	    close_socket])
-    of
-	{ok,E} ->
-	    [Kex, PubKey, EncC2S, EncS2C, MacC2S, MacS2C, CompC2S, CompS2C] =
-		ssh_trpt_test_lib:instantiate(['$kex_algorithms',
-					       '$server_host_key_algorithms',
-					       '$encryption_algorithms_client_to_server',
-					       '$encryption_algorithms_server_to_client',
-					       '$mac_algorithms_client_to_server',
-					       '$mac_algorithms_server_to_client',
-					       '$compression_algorithms_client_to_server',
-					       '$compression_algorithms_server_to_client'
-					      ], E),
-	    [{kex, to_atoms(Kex)},
-	     {public_key, to_atoms(PubKey)},
-	     {cipher, [{client2server, to_atoms(EncC2S)},
-		       {server2client, to_atoms(EncS2C)}]},
-	     {mac, [{client2server, to_atoms(MacC2S)},
-		    {server2client, to_atoms(MacS2C)}]},
-	     {compression, [{client2server, to_atoms(CompC2S)},
-			    {server2client, to_atoms(CompS2C)}]}];
-	_ ->
-	    []
-    catch
-	_:_ ->
-	    []
-    end.
-
-
-default_algorithms(sshd) ->
-    default_algorithms("localhost", 22);
-default_algorithms(sshc) ->
-    case os:find_executable("ssh") of
-	false -> 
-	    [];
-	_ ->
-	    Cipher = sshc(cipher),
-	    Mac = sshc(mac),
-	    [{kex, sshc(kex)},
-	     {public_key, sshc(key)},
-	     {cipher, [{client2server, Cipher},
-		       {server2client, Cipher}]},
-	     {mac, [{client2server, Mac},
-		    {server2client, Mac}]}
-	    ]
-    end.
-
+%%--------------------------------------------------------------------
 sshc(Tag) -> 
     to_atoms(
       string:tokens(os:cmd(lists:concat(["ssh -Q ",Tag])), "\n")
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 026fe545c1..b5b997cb53 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -45,7 +45,6 @@ all() ->
 
 groups() -> 
     [{erlang_client, [], [erlang_shell_client_openssh_server,
-			  erlang_client_openssh_server_exec,
 			  erlang_client_openssh_server_exec_compressed,
 			  erlang_client_openssh_server_setenv,
 			  erlang_client_openssh_server_publickey_rsa,
@@ -54,12 +53,7 @@ groups() ->
 			  erlang_client_openssh_server_kexs,
 			  erlang_client_openssh_server_nonexistent_subsystem
 			 ]},
-     {erlang_server, [], [erlang_server_openssh_client_exec,
-			  erlang_server_openssh_client_exec_compressed,
-			  erlang_server_openssh_client_pulic_key_dsa,
-			  erlang_server_openssh_client_cipher_suites,
-			  erlang_server_openssh_client_macs,
-			  erlang_server_openssh_client_kexs]}
+     {erlang_server, [], [erlang_server_openssh_client_pulic_key_dsa]}
     ].
 
 init_per_suite(Config) ->
@@ -88,7 +82,7 @@ init_per_group(erlang_server, Config) ->
 init_per_group(erlang_client, Config) ->
     CommonAlgs = ssh_test_lib:algo_intersection(
 		   ssh:default_algorithms(),
-		   ssh_test_lib:default_algorithms("localhost", 22)),
+		   ssh_test_lib:default_algorithms(sshd)),
     [{common_algs,CommonAlgs} | Config];
 init_per_group(_, Config) ->
     Config.
@@ -100,18 +94,6 @@ end_per_group(erlang_server, Config) ->
 end_per_group(_, Config) ->
     Config.
 
-init_per_testcase(erlang_server_openssh_client_cipher_suites, Config) ->
-    check_ssh_client_support(Config);
-
-init_per_testcase(erlang_server_openssh_client_macs, Config) ->
-    check_ssh_client_support(Config);
-
-init_per_testcase(erlang_server_openssh_client_kexs, Config) ->
-    check_ssh_client_support(Config);
-
-init_per_testcase(erlang_client_openssh_server_kexs, Config) ->
-    check_ssh_client_support(Config);
-
 init_per_testcase(_TestCase, Config) ->
     ssh:start(),
     Config.
@@ -258,207 +240,6 @@ erlang_client_openssh_server_kexs(Config) when is_list(Config) ->
     end.
 
 %%--------------------------------------------------------------------
-erlang_server_openssh_client_exec() ->
-    [{doc, "Test that exec command works."}].
-
-erlang_server_openssh_client_exec(Config) when is_list(Config) ->
-    SystemDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
-    
-
-    ct:sleep(500),
-
-    Cmd = "ssh -p " ++ integer_to_list(Port) ++
-	" -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " 1+1.",
-
-    ct:log("Cmd: ~p~n", [Cmd]),
-
-    SshPort = open_port({spawn, Cmd}, [binary]),
-
-    receive
-        {SshPort,{data, <<"2\n">>}} ->
-	    ok
-    after ?TIMEOUT ->
-	    ct:fail("Did not receive answer")
-
-    end,
-     ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-erlang_server_openssh_client_cipher_suites() ->
-    [{doc, "Test that we can connect with different cipher suites."}].
-
-erlang_server_openssh_client_cipher_suites(Config) when is_list(Config) ->
-    SystemDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
-
-    ct:sleep(500),
-
-    OpenSshCiphers = 
-	ssh_test_lib:to_atoms(
-	  string:tokens(os:cmd("ssh -Q cipher"), "\n")),
-    ErlCiphers =
-	proplists:get_value(client2server,
-			    proplists:get_value(cipher, ssh:default_algorithms())),
-    CommonCiphers =
-	ssh_test_lib:algo_intersection(ErlCiphers, OpenSshCiphers),
-
-    comment(CommonCiphers),
-
-    lists:foreach(
-      fun(Cipher) ->
-	      Cmd = lists:concat(["ssh -p ",Port,
-				  " -o UserKnownHostsFile=",KnownHosts," ",Host," ",
-				  " -c ",Cipher," 1+1."]),
-	      ct:log("Cmd: ~p~n", [Cmd]),
-
-	      SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
-
-	      receive
-		  {SshPort,{data, <<"2\n">>}} ->
-		      ok
-	      after ?TIMEOUT ->
-		      ct:fail("~p Did not receive answer",[Cipher])
-	      end
-      end, CommonCiphers),
-    
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-erlang_server_openssh_client_macs() ->
-    [{doc, "Test that we can connect with different MACs."}].
-
-erlang_server_openssh_client_macs(Config) when is_list(Config) ->
-    SystemDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
-
-
-    ct:sleep(500),
-
-    OpenSshMacs = 
-	ssh_test_lib:to_atoms(
-	  string:tokens(os:cmd("ssh -Q mac"), "\n")),
-    ErlMacs =
-	proplists:get_value(client2server,
-			    proplists:get_value(mac, ssh:default_algorithms())),
-    CommonMacs =
-	ssh_test_lib:algo_intersection(ErlMacs, OpenSshMacs),
-
-    comment(CommonMacs),
-
-    lists:foreach(
-      fun(MAC) ->
-	      Cmd = lists:concat(["ssh -p ",Port,
-				  " -o UserKnownHostsFile=",KnownHosts," ",Host," ",
-				  " -o MACs=",MAC," 1+1."]),
-	      ct:log("Cmd: ~p~n", [Cmd]),
-
-	      SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
-
-	      receive
-		  {SshPort,{data, <<"2\n">>}} ->
-		      ok
-	      after ?TIMEOUT ->
-		      ct:fail("~p Did not receive answer",[MAC])
-	      end
-      end, CommonMacs),
-
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-erlang_server_openssh_client_kexs() ->
-    [{doc, "Test that we can connect with different KEXs."}].
-
-erlang_server_openssh_client_kexs(Config) when is_list(Config) ->
-    SystemDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {failfun, fun ssh_test_lib:failfun/2},
-					     {preferred_algorithms,
-					      [{kex,ssh_transport:default_algorithms(kex)}]}
-					    ]),
-    ct:sleep(500),
-
-    OpenSshKexs = 
-	ssh_test_lib:to_atoms(
-	  string:tokens(os:cmd("ssh -Q kex"), "\n")),
-    ErlKexs =
-	proplists:get_value(kex, ssh:default_algorithms()),
-    CommonKexs =
-	ssh_test_lib:algo_intersection(ErlKexs, OpenSshKexs),
-
-    comment(CommonKexs),
-
-    lists:foreach(
-      fun(Kex) ->
-	      Cmd = lists:concat(["ssh -p ",Port,
-				  " -o UserKnownHostsFile=",KnownHosts," ",Host," ",
-				  " -o KexAlgorithms=",Kex," 1+1."]),
-	      ct:log("Cmd: ~p~n", [Cmd]),
-
-	      SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
-
-	      receive
-		  {SshPort,{data, <<"2\n">>}} ->
-		      ok
-	      after ?TIMEOUT ->
-		      ct:log("~p Did not receive answer",[Kex])
-	      end
-      end, CommonKexs),
-    
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-erlang_server_openssh_client_exec_compressed() ->
-    [{doc, "Test that exec command works."}].
-
-erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
-    SystemDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-
-    CompressAlgs = [zlib, '[email protected]'], % Does not work
-%%    CompressAlgs = [zlib],
-    case ssh_test_lib:ssh_supports(CompressAlgs, compression) of
-	{false,L} ->
-	    {skip, io_lib:format("~p compression is not supported",[L])};
-
-	true ->
-	    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-						     {preferred_algorithms,
-						      [{compression, CompressAlgs}]},
-						     {failfun, fun ssh_test_lib:failfun/2}]),
-
-	    ct:sleep(500),
-
-	    Cmd = "ssh -p " ++ integer_to_list(Port) ++
-		" -o UserKnownHostsFile=" ++ KnownHosts ++ " -C "++ Host ++ " 1+1.",
-	    SshPort = open_port({spawn, Cmd}, [binary]),
-
-	    receive
-		{SshPort,{data, <<"2\n">>}} ->
-		    ok
-	    after ?TIMEOUT ->
-		    ct:fail("Did not receive answer")
-	    end,
-	    ssh:stop_daemon(Pid)
-    end.
-
-%%--------------------------------------------------------------------
 erlang_client_openssh_server_setenv() ->
     [{doc, "Test api function ssh_connection:setenv"}].
 
diff --git a/lib/ssh/test/ssh_trpt_test_lib.erl b/lib/ssh/test/ssh_trpt_test_lib.erl
index 772e50df87..5080b33249 100644
--- a/lib/ssh/test/ssh_trpt_test_lib.erl
+++ b/lib/ssh/test/ssh_trpt_test_lib.erl
@@ -73,7 +73,10 @@ exec(Op, S0=#s{}) ->
 	  op(Op, S1))
     of
 	S = #s{} ->
-	    print_traces(S),
+	    case proplists:get_value(silent,S#s.opts) of
+		true -> ok;
+		_ -> print_traces(S)
+	    end,
 	    {ok,S}
     catch
 	{fail,Reason,Se} ->