From e85e355ddbc27b6f8252bbb31046ed41f937c091 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 15 Jan 2014 11:01:38 -0800 Subject: [PATCH] core: fix Windows failures on machine tests --- test/unit/vagrant/machine_test.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/unit/vagrant/machine_test.rb b/test/unit/vagrant/machine_test.rb index 5f386986e..b8e2f45d8 100644 --- a/test/unit/vagrant/machine_test.rb +++ b/test/unit/vagrant/machine_test.rb @@ -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