From 4eb26d0aec76f5f9588b330448511172146ac078 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 11 Oct 2017 14:53:38 +0200
Subject: ssh: Fix testcase failures caused by better key checks

---
 .../property_test/ssh_eqc_client_info_timing.erl   |  9 +++++----
 lib/ssh/test/ssh_basic_SUITE.erl                   | 23 ++++++++++++----------
 lib/ssh/test/ssh_protocol_SUITE.erl                |  5 +++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl b/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl
index c07140dc43..19e2754eba 100644
--- a/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl
@@ -57,9 +57,9 @@
 
 %%% Properties:
 
-prop_seq(_Config) ->
+prop_seq(Config) ->
     {ok,Pid} = ssh_eqc_event_handler:add_report_handler(),
-    {_, _, Port} = init_daemon(),
+    {_, _, Port} = init_daemon(Config),
     numtests(1000,
 	     ?FORALL(Delay, choose(0,100),%% Micro seconds
 		     try 
@@ -86,7 +86,8 @@ any_relevant_error_report(Pid) ->
 	      end, Reports).
 
 %%%================================================================
-init_daemon() ->
+init_daemon(Config) ->
     ok = begin ssh:stop(), ssh:start() end,
-    ssh_test_lib:daemon([]).
+    DataDir = proplists:get_value(data_dir, Config),
+    ssh_test_lib:daemon([{system_dir,DataDir}]).
 
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 1569a5c0ac..202b0afe57 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -332,7 +332,8 @@ init_per_group(internal_error, Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     PrivDir = proplists:get_value(priv_dir, Config),
     ssh_test_lib:setup_dsa(DataDir, PrivDir),
-    file:delete(filename:join(PrivDir, "system/ssh_host_dsa_key")),
+    %% In the test case the key will be deleted after the daemon start:
+    %% ... file:delete(filename:join(PrivDir, "system/ssh_host_dsa_key")),
     Config;
 init_per_group(dir_options, Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
@@ -896,12 +897,17 @@ key_callback_options(Config) when is_list(Config) ->
 %%% Test that client does not hang if disconnects due to internal error
 internal_error(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    SystemDir = filename:join(proplists:get_value(priv_dir, Config), system),
+    PrivDir = proplists:get_value(priv_dir, Config),
     UserDir = proplists:get_value(priv_dir, Config),
+    SystemDir = filename:join(PrivDir, system),
     
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
                                              {user_dir, UserDir},
                                              {failfun, fun ssh_test_lib:failfun/2}]),
+
+    %% Now provoke an error in the following connect:
+    file:delete(filename:join(PrivDir, "system/ssh_host_dsa_key")), 
+
     {error, Error} =
         ssh:connect(Host, Port, [{silently_accept_hosts, true},
                                  {user_dir, UserDir},
@@ -1339,14 +1345,11 @@ shell_exit_status(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %% Due to timing the error message may or may not be delivered to
 %% the "tcp-application" before the socket closed message is recived
-check_error("Invalid state") ->
-    ok;
-check_error("Connection closed") ->
-    ok;
-check_error("Selection of key exchange algorithm failed"++_) ->
-    ok;
-check_error(Error) ->
-    ct:fail(Error).
+check_error("Invalid state") -> ok;
+check_error("Connection closed") -> ok;
+check_error("Selection of key exchange algorithm failed"++_) -> ok;
+check_error("No host key available") -> ok;
+check_error(Error) -> ct:fail(Error).
 
 basic_test(Config) ->
     ClientOpts = proplists:get_value(client_opts, Config),
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 74f802cf57..3e3e151781 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -630,11 +630,12 @@ client_handles_keyboard_interactive_0_pwds(Config) ->
 
 
 %%%--------------------------------------------------------------------
-client_info_line(_Config) ->
+client_info_line(Config) ->
     %% A client must not send an info-line. If it does, the server should handle
     %% handle this gracefully
     {ok,Pid} = ssh_eqc_event_handler:add_report_handler(),
-    {_, _, Port} = ssh_test_lib:daemon([]),
+    DataDir = proplists:get_value(data_dir, Config),
+    {_, _, Port} = ssh_test_lib:daemon([{system_dir,DataDir}]),
 
     %% Fake client:
     {ok,S} = gen_tcp:connect("localhost",Port,[]),
-- 
cgit v1.2.3