From ce5f7b7e1842b1866c55e6f024c143c598709280 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 1 Jun 2016 14:14:33 +0200
Subject: [ct test] Check that crypto is loaded, or skip netconf tests

Tests for ct_netconfc are failed instead of skipped if crypto can not
be loaded. This is now corrected.
---
 lib/common_test/test/ct_netconfc_SUITE.erl         | 32 +++++++++++++++-------
 .../ct_netconfc_SUITE_data/netconfc1_SUITE.erl     |  7 +++--
 .../netconfc_remote_SUITE.erl                      | 15 +++++-----
 3 files changed, 34 insertions(+), 20 deletions(-)

(limited to 'lib/common_test/test')

diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 03fbc17bd2..2919f01605 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -44,16 +44,28 @@
 %% there will be clashes with logging processes etc).
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    case application:load(crypto) of
-	{error,Reason} when Reason=/={already_loaded,crypto} ->
-	    {skip, Reason};
-	_ ->
-	    case application:load(ssh) of
-		{error,Reason} when Reason=/={already_loaded,ssh} ->
-		    {skip, Reason};
-		_ ->
-		    ct_test_support:init_per_suite(Config)
-	    end
+    case check_crypto_and_ssh() of
+	ok ->
+	    ct_test_support:init_per_suite(Config);
+	Skip ->
+	    Skip
+    end.
+
+check_crypto_and_ssh() ->
+    (catch code:load_file(crypto)),
+    case code:is_loaded(crypto) of
+	{file,_} ->
+	    case ssh:start() of
+		Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+		    ct:log("ssh started",[]),
+		    ok;
+		Other ->
+		    ct:log("could not start ssh: ~p",[Other]),
+		    {skip, "SSH could not be started!"}
+	    end;
+	Other ->
+	    ct:log("could not load crypto: ~p",[Other]),
+	    {skip, "crypto could not be loaded!"}
     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 cddb07fad5..2aa6c4d354 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
@@ -124,8 +124,9 @@ end_per_testcase(_Case, _Config) ->
     ok.
 
 init_per_suite(Config) ->
-    case catch ssh:start() of
-	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+    (catch code:load_file(crypto)),
+    case {ssh:start(),code:is_loaded(crypto)} of
+	{Ok,{file,_}} when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("ssh started",[]),
 	    SshDir = filename:join(filename:dirname(code:which(?MODULE)),
 				   "ssh_dir"),
@@ -133,7 +134,7 @@ init_per_suite(Config) ->
 	    ct:log("netconf server started",[]),
 	    [{netconf_server,Server},{ssh_dir,SshDir}|Config];
 	Other ->
-	    ct:log("could not start ssh: ~p",[Other]),
+	    ct:log("could not start ssh or load crypto: ~p",[Other]),
 	    {skip, "SSH could not be started!"}
     end.
 
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 0a49cdabbb..a65275da43 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
@@ -62,14 +62,15 @@ stop_node(Case) ->
 
 
 init_per_suite(Config) ->
-    case ssh:start() of
-	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+    (catch code:load_file(crypto)),
+    case {ssh:start(),code:is_loaded(crypto)} of
+	{Ok,{file,_}} when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("SSH started locally",[]),
 	    SshDir = filename:join(filename:dirname(code:which(?MODULE)),
 				   "ssh_dir"),
 	    [{ssh_dir,SshDir}|Config];
 	Other ->
-	    ct:log("could not start ssh locally: ~p",[Other]),
+	    ct:log("could not start ssh or load crypto locally: ~p",[Other]),
 	    {skip, "SSH could not be started locally!"}
     end.
 
@@ -85,15 +86,15 @@ remote_crash(Config) ->
     {ok,Node} = ct_slave:start(nc_remote_crash),
     Pa = filename:dirname(code:which(?NS)),
     true = rpc:call(Node,code,add_patha,[Pa]),
-    
-    case rpc:call(Node,ssh,start,[]) of
-	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
+    rpc:call(Node,code,load_file,[crypto]),
+    case {rpc:call(Node,ssh,start,[]),rpc:call(Node,code,is_loaded,[crypto])} of
+	{Ok,{file,_}} when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("SSH started remote",[]),
 	    ns(Node,start,[?config(ssh_dir,Config)]),
 	    ct:log("netconf server started remote",[]),
 	    remote_crash(Node,Config);
 	Other ->
-	    ct:log("could not start ssh remote: ~p",[Other]),
+	    ct:log("could not start ssh or load crypto remote: ~p",[Other]),
 	    {skip, "SSH could not be started remote!"}
     end.
 
-- 
cgit v1.2.3