From 2f91341ae855b28c82024caa87c7541e94f68a18 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 29 Mar 2017 12:57:23 +0200
Subject: ssh: Make test suites pass

---
 lib/ssh/test/ssh_sup_SUITE.erl | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'lib/ssh/test/ssh_sup_SUITE.erl')

diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index fdeb8186a5..dd7c4b1473 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -137,16 +137,18 @@ sshd_subtree(Config) when is_list(Config) ->
     HostIP = proplists:get_value(host_ip, Config),
     Port = proplists:get_value(port, Config),
     SystemDir = proplists:get_value(data_dir, Config),
-    ssh:daemon(HostIP, Port, [{system_dir, SystemDir},
-			      {failfun, fun ssh_test_lib:failfun/2},
-			      {user_passwords,
-			       [{?USER, ?PASSWD}]}]),
+    {ok,Daemon} = ssh:daemon(HostIP, Port, [{system_dir, SystemDir},
+                                            {failfun, fun ssh_test_lib:failfun/2},
+                                            {user_passwords,
+                                             [{?USER, ?PASSWD}]}]),
 
-    ?wait_match([{{server,ssh_system_sup, HostIP, Port, ?DEFAULT_PROFILE},
+    ct:log("Expect HostIP=~p, Port=~p, Daemon=~p",[HostIP,Port,Daemon]),
+    ?wait_match([{{server,ssh_system_sup, ListenIP, Port, ?DEFAULT_PROFILE},
 		  Daemon, supervisor,
 		  [ssh_system_sup]}],
 		supervisor:which_children(sshd_sup),
-		Daemon),
+		[ListenIP,Daemon]),
+    true = ssh_test_lib:match_ip(HostIP, ListenIP),
     check_sshd_system_tree(Daemon, Config),
     ssh:stop_daemon(HostIP, Port),
     ct:sleep(?WAIT_FOR_SHUTDOWN),
@@ -161,16 +163,18 @@ sshd_subtree_profile(Config) when is_list(Config) ->
     Profile = proplists:get_value(profile, Config), 
     SystemDir = proplists:get_value(data_dir, Config),
 
-    {ok, _} = ssh:daemon(HostIP, Port, [{system_dir, SystemDir},
-				  {failfun, fun ssh_test_lib:failfun/2},
-				  {user_passwords,
-				   [{?USER, ?PASSWD}]},
-				  {profile, Profile}]),
-    ?wait_match([{{server,ssh_system_sup, HostIP,Port,Profile},
+    {ok, Daemon} = ssh:daemon(HostIP, Port, [{system_dir, SystemDir},
+                                             {failfun, fun ssh_test_lib:failfun/2},
+                                             {user_passwords,
+                                              [{?USER, ?PASSWD}]},
+                                             {profile, Profile}]),
+    ct:log("Expect HostIP=~p, Port=~p, Profile=~p, Daemon=~p",[HostIP,Port,Profile,Daemon]),
+    ?wait_match([{{server,ssh_system_sup, ListenIP,Port,Profile},
 		  Daemon, supervisor,
 		  [ssh_system_sup]}],
 		supervisor:which_children(sshd_sup),
-		Daemon),
+		[ListenIP,Daemon]),
+    true = ssh_test_lib:match_ip(HostIP, ListenIP),
     check_sshd_system_tree(Daemon, Config),
     ssh:stop_daemon(HostIP, Port, Profile),
     ct:sleep(?WAIT_FOR_SHUTDOWN),
@@ -310,3 +314,4 @@ acceptor_pid(DaemonPid) ->
     receive {Pid, supsearch, L} -> {ok,L}
     after 2000 -> timeout
     end.
+
-- 
cgit v1.2.3