Tests for SSHExec, and forward in the ssh options
This commit is contained in:
parent
e0ec679838
commit
8d50c4774e
|
@ -28,8 +28,7 @@ module Vagrant
|
||||||
SSH.check_key_permissions(info[:private_key_path])
|
SSH.check_key_permissions(info[:private_key_path])
|
||||||
|
|
||||||
# Exec!
|
# Exec!
|
||||||
# XXX: Options given in env
|
SSH.exec(info, env[:ssh_opts])
|
||||||
SSH.exec(info)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,12 +11,36 @@ describe Vagrant::Action::Builtin::SSHExec do
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
let(:machine_ssh_info) { {} }
|
let(:machine_ssh_info) { {} }
|
||||||
|
let(:ssh_klass) { Vagrant::Util::SSH }
|
||||||
|
|
||||||
|
before(:each) do
|
||||||
|
# Stub the methods so that even if we test incorrectly, no side
|
||||||
|
# effects actually happen.
|
||||||
|
ssh_klass.stub(:check_key_permissions)
|
||||||
|
ssh_klass.stub(:exec)
|
||||||
|
end
|
||||||
|
|
||||||
it "should check key permissions then exec" do
|
it "should check key permissions then exec" do
|
||||||
pending
|
ssh_klass.should_receive(:check_key_permissions).
|
||||||
|
with(machine_ssh_info[:private_key_path]).
|
||||||
|
once.
|
||||||
|
ordered
|
||||||
|
|
||||||
|
ssh_klass.should_receive(:exec).
|
||||||
|
with(machine_ssh_info, nil).
|
||||||
|
once.
|
||||||
|
ordered
|
||||||
|
|
||||||
|
described_class.new(app, env).call(env)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should exec with the options given in `ssh_opts`" do
|
it "should exec with the options given in `ssh_opts`" do
|
||||||
pending
|
ssh_opts = { :foo => :bar }
|
||||||
|
|
||||||
|
ssh_klass.should_receive(:exec).
|
||||||
|
with(machine_ssh_info, ssh_opts)
|
||||||
|
|
||||||
|
env[:ssh_opts] = ssh_opts
|
||||||
|
described_class.new(app, env).call(env)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue