diff options
author | larry <larry@elsa> | 2014-08-29 09:36:41 +0200 |
---|---|---|
committer | larry <larry@elsa> | 2014-08-29 09:36:41 +0200 |
commit | b1a15a8e248bcd2cd9ef826f75bb3ec77ae528ff (patch) | |
tree | 2fa1728b8d4bacc4f11a4d6afbbf2ca8b659794f /lib | |
parent | a75f44aafa24d38d9ab3036d2059ce0915069105 (diff) | |
download | otp-b1a15a8e248bcd2cd9ef826f75bb3ec77ae528ff.tar.gz otp-b1a15a8e248bcd2cd9ef826f75bb3ec77ae528ff.tar.bz2 otp-b1a15a8e248bcd2cd9ef826f75bb3ec77ae528ff.zip |
common_test: start ssh and dependencies
Diffstat (limited to 'lib')
-rw-r--r-- | lib/common_test/src/ct_slave.erl | 17 |
1 files changed, 1 insertions, 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), |