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

core: be sure to close tempfile handle so Windows can delete it

This commit is contained in:
Mitchell Hashimoto 2014-01-15 11:24:03 -08:00
parent 8652d87865
commit 8a56d0ae5e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/unit/vagrant/environment_test.rb
View File

@ -5,6 +5,7 @@ require "tempfile"
require "tmpdir" require "tmpdir"
require "vagrant/util/file_mode" require "vagrant/util/file_mode"
require "vagrant/util/platform"
describe Vagrant::Environment do describe Vagrant::Environment do
include_context "unit" include_context "unit"
@ -287,7 +288,12 @@ describe Vagrant::Environment do
end end
describe "upgrading V1 dotfiles" do describe "upgrading V1 dotfiles" do
let(:v1_dotfile_tempfile) { Tempfile.new("vagrant") } let(:v1_dotfile_tempfile) do
Tempfile.new("vagrant").tap do |f|
f.close
end
end
let(:v1_dotfile) { Pathname.new(v1_dotfile_tempfile.path) } let(:v1_dotfile) { Pathname.new(v1_dotfile_tempfile.path) }
let(:local_data_path) { v1_dotfile_tempfile.path } let(:local_data_path) { v1_dotfile_tempfile.path }
let(:instance) { described_class.new(:local_data_path => local_data_path) } let(:instance) { described_class.new(:local_data_path => local_data_path) }
@ -343,7 +349,10 @@ describe Vagrant::Environment do
pk = env.homedir.join("insecure_private_key") pk = env.homedir.join("insecure_private_key")
pk.should be_exist pk.should be_exist
Vagrant::Util::FileMode.from_octal(pk.stat.mode).should == "600"
if !Vagrant::Util::Platform.windows?
Vagrant::Util::FileMode.from_octal(pk.stat.mode).should == "600"
end
end end
end end