haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: fix Windows failures on machine tests

This commit is contained in:
Mitchell Hashimoto 2014-01-15 11:01:38 -08:00
parent b386e1dbbd
commit e85e355ddb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/unit/vagrant/machine_test.rb
View File

@ -332,22 +332,24 @@ describe Vagrant::Machine do
it "should return the provider private key if given" do
provider_ssh_info[:private_key_path] = "/foo"
instance.ssh_info[:private_key_path].should == ["/foo"]
instance.ssh_info[:private_key_path].should == [File.expand_path("/foo", env.root_path)]
end
it "should return the configured SSH key path if set" do
provider_ssh_info[:private_key_path] = nil
instance.config.ssh.private_key_path = "/bar"
instance.ssh_info[:private_key_path].should == ["/bar"]
instance.ssh_info[:private_key_path].should == [File.expand_path("/bar", env.root_path)]
end
it "should return the array of SSH keys if set" do
provider_ssh_info[:private_key_path] = nil
instance.config.ssh.private_key_path = ["/foo", "/bar"]
instance.ssh_info[:private_key_path].should ==
["/foo", "/bar"]
instance.ssh_info[:private_key_path].should == [
File.expand_path("/foo", env.root_path),
File.expand_path("/bar", env.root_path),
]
end
context "expanding path relative to the root path" do