Merge branch 'siri/cuddle-master'

* siri/cuddle-master:
  Extend timer in test
  Update crashdump_viewer_SUITE with new release numbers
  Set longer timetrap when creating dsa files
  Check that ssh application exists before starting netconf tests
  Improve error control when starting ssh in netconf test

3 files changed, 36 insertions, 19 deletions

diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 72c1de4023..03fbc17bd2 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -48,7 +48,12 @@ init_per_suite(Config) ->
 	{error,Reason} when Reason=/={already_loaded,crypto} ->
 	    {skip, Reason};
 	_ ->
-	    ct_test_support:init_per_suite(Config)
+	    case application:load(ssh) of
+		{error,Reason} when Reason=/={already_loaded,ssh} ->
+		    {skip, Reason};
+		_ ->
+		    ct_test_support:init_per_suite(Config)
+	    end
     end.
 
 end_per_suite(Config) ->
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index e4062a7d62..065639dd36 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -123,15 +123,21 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
+init_per_suite() ->
+    [{timetrap,2*?default_timeout}]. % making dsa files can be slow
 init_per_suite(Config) ->
-    case catch {crypto:start(), ssh:start()} of
-	{ok, ok} ->
+    case catch ssh:start() of
+	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+	    ct:log("ssh started",[]),
 	    {ok, _} =  netconfc_test_lib:get_id_keys(Config),
 	    netconfc_test_lib:make_dsa_files(Config),
+	    ct:log("dsa files created",[]),
 	    Server = ?NS:start(?config(data_dir,Config)),
+	    ct:log("netconf server started",[]),
 	    [{server,Server}|Config];
-	_ ->
-	    {skip, "Crypto and/or SSH could not be started!"}
+	Other ->
+	    ct:log("could not start ssh: ~p",[Other]),
+	    {skip, "SSH could not be started!"}
     end.
 
 end_per_suite(Config) ->
@@ -806,7 +812,7 @@ close_while_waiting_for_chunked_data(Config) ->
     %% Order server to expect a get - then the process above will make
     %% sure the rpc-reply is sent - but only a part of it - then close.
     ?NS:expect('get'),
-    {error,closed} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},2000),
+    {error,closed} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},4000),
     ok.
 
 connection_crash(Config) ->
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
index ae9087ce45..04bfe75187 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
@@ -26,7 +26,8 @@
 -compile(export_all).
 
 suite() ->
-    [{ct_hooks, [{cth_conn_log,[{ct_netconfc,[{log_type,html}]}]}]}].
+    [{timetrap,?default_timeout},
+     {ct_hooks, [{cth_conn_log,[{ct_netconfc,[{log_type,html}]}]}]}].
 
 all() ->
     case os:find_executable("ssh") of
@@ -48,13 +49,10 @@ end_per_group(_GroupName, Config) ->
 
 init_per_testcase(Case, Config) ->
     stop_node(Case),
-    Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) ->
     stop_node(Case),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 stop_node(Case) ->
@@ -63,14 +61,19 @@ stop_node(Case) ->
     rpc:call(Node,erlang,halt,[]).
 
 
+init_per_suite() ->
+    [{timetrap,2*?default_timeout}]. % making dsa files can be slow
 init_per_suite(Config) ->
-    case {crypto:start(),ssh:start()} of
-	{ok,ok} ->
+    case ssh:start() of
+	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+	    ct:log("SSH started locally",[]),
 	    {ok, _} =  netconfc_test_lib:get_id_keys(Config),
 	    netconfc_test_lib:make_dsa_files(Config),
+	    ct:log("dsa files created",[]),
 	    Config;
-	_ ->
-	    {skip, "Crypto and/or SSH could not be started locally!"}
+	Other ->
+	    ct:log("could not start ssh locally: ~p",[Other]),
+	    {skip, "SSH could not be started locally!"}
     end.
 
 end_per_suite(Config) ->
@@ -87,12 +90,15 @@ remote_crash(Config) ->
     Pa = filename:dirname(code:which(?NS)),
     true = rpc:call(Node,code,add_patha,[Pa]),
     
-    case {rpc:call(Node,crypto,start,[]),rpc:call(Node,ssh,start,[])} of
-	{ok,ok} ->
+    case rpc:call(Node,ssh,start,[]) of
+	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+	    ct:log("SSH started remote",[]),
 	    Server = rpc:call(Node,?NS,start,[?config(data_dir,Config)]),
+	    ct:log("netconf server started remote",[]),
 	    remote_crash(Node,Config);
-	_ ->
-	    {skip, "Crypto and/or SSH could not be started remote!"}
+	Other ->
+	    ct:log("could not start ssh remote: ~p",[Other]),
+	    {skip, "SSH could not be started remote!"}
     end.
 
 remote_crash(Node,Config) ->