From b1a15a8e248bcd2cd9ef826f75bb3ec77ae528ff Mon Sep 17 00:00:00 2001
From: larry <larry@elsa>
Date: Fri, 29 Aug 2014 09:36:41 +0200
Subject: common_test: start ssh and dependencies

---
 lib/common_test/src/ct_slave.erl | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 872c39de04..cac8bd4ee2 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -399,21 +399,6 @@ spawn_local_node(Node, Options) ->
     Cmd = get_cmd(Node, ErlFlags),
     open_port({spawn, Cmd}, [stream,{env,Env}]).
 
-% start crypto and ssh if not yet started
-check_for_ssh_running() ->
-    case application:get_application(crypto) of
-	undefined->
-	    application:start(crypto),
-	    case application:get_application(ssh) of
-		undefined->
-		    application:start(ssh);
-		{ok, ssh}->
-		    ok
-	    end;
-	{ok, crypto}->
-	    ok
-    end.
-
 % spawn node remotely
 spawn_remote_node(Host, Node, Options) ->
     #options{username=Username,
@@ -428,7 +413,7 @@ spawn_remote_node(Host, Node, Options) ->
 	{_, _}->
 	    [{user, Username}, {password, Password}]
     end ++ [{silently_accept_hosts, true}],
-    check_for_ssh_running(),
+    application:ensure_all_started(ssh),
     {ok, SSHConnRef} = ssh:connect(atom_to_list(Host), 22, SSHOptions),
     {ok, SSHChannelId} = ssh_connection:session_channel(SSHConnRef, infinity),
     ssh_setenv(SSHConnRef, SSHChannelId, Env),
-- 
cgit v1.2.3