Merge branch 'siri/cuddle-master'

* siri/cuddle-master:
  [ct test] Wait for event receiver to be unregistered
  [ct test] Flush messages from old client after close in telnet server
  [ct test] Use monitor instead of ct:sleep
  [ct test] Check that crypto is loaded, or skip netconf tests
  [ct test] Reduce amount of data in netconfc1_SUITE:get_a_lot

1 files changed, 22 insertions, 10 deletions

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) ->