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

Clear NFS exports if an error occured in the environment in NFS

This commit is contained in:
Mitchell Hashimoto 2010-07-13 22:58:45 -07:00
parent 4472ce1879
commit 8dc839e0c7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/vagrant/action/vm/nfs.rb
View File

@ -41,6 +41,7 @@ module Vagrant
@app.call(env) @app.call(env)
mount_folders if !folders.empty? && !env.error? mount_folders if !folders.empty? && !env.error?
clear_nfs_exports(env) if env.error?
end end
# Returns the folders which are to be synced via NFS. # Returns the folders which are to be synced via NFS.

7
test/vagrant/action/vm/nfs_test.rb
View File

@ -37,7 +37,7 @@ class NFSVMActionTest < Test::Unit::TestCase
setup do setup do
@instance.stubs(:folders).returns([:a]) @instance.stubs(:folders).returns([:a])
[:extract_folders, :export_folders, :mount_folders].each do |meth| [:clear_nfs_exports, :extract_folders, :export_folders, :mount_folders].each do |meth|
@instance.stubs(meth) @instance.stubs(meth)
end end
end end
@ -76,13 +76,16 @@ class NFSVMActionTest < Test::Unit::TestCase
end end
should "not mount folders if an error occured" do should "not mount folders if an error occured" do
@app.expects(:call).with() do seq = sequence("seq")
@app.expects(:call).in_sequence(seq).with() do
# Use this mark the env as error # Use this mark the env as error
@env.error!(:foo) @env.error!(:foo)
true true
end end
@instance.expects(:clear_nfs_exports).with(@env).in_sequence(seq)
@instance.expects(:mount_folders).never @instance.expects(:mount_folders).never
@instance.call(@env) @instance.call(@env)
end end