NFS no longer attempts to clean exports file if VM is not created, which caused a stack trace during recovery.
This commit is contained in:
parent
ed645417c7
commit
bad251a20d
|
@ -1,5 +1,7 @@
|
||||||
## 0.6.4 (unreleased)
|
## 0.6.4 (unreleased)
|
||||||
|
|
||||||
|
- NFS no longer attempts to clean exports file if VM is not created,
|
||||||
|
which was causing a stack trace during recovery. [related to GH-166]
|
||||||
- Basic validation added for Chef configuration (both solo and server).
|
- Basic validation added for Chef configuration (both solo and server).
|
||||||
- Top config class is now available in all `Vagrant::Config::Base`
|
- Top config class is now available in all `Vagrant::Config::Base`
|
||||||
subclasses, which is useful for config validation.
|
subclasses, which is useful for config validation.
|
||||||
|
|
|
@ -42,7 +42,7 @@ module Vagrant
|
||||||
end
|
end
|
||||||
|
|
||||||
def recover(env)
|
def recover(env)
|
||||||
clear_nfs_exports(env)
|
clear_nfs_exports(env) if env["vm"].created?
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the folders which are to be synced via NFS.
|
# Returns the folders which are to be synced via NFS.
|
||||||
|
|
|
@ -68,10 +68,20 @@ class NFSVMActionTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
context "recovery" do
|
context "recovery" do
|
||||||
|
setup do
|
||||||
|
@vm.stubs(:created?).returns(true)
|
||||||
|
end
|
||||||
|
|
||||||
should "clear NFS exports" do
|
should "clear NFS exports" do
|
||||||
@instance.expects(:clear_nfs_exports).with(@env).once
|
@instance.expects(:clear_nfs_exports).with(@env).once
|
||||||
@instance.recover(@env)
|
@instance.recover(@env)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "do nothing if VM is not created" do
|
||||||
|
@vm.stubs(:created?).returns(false)
|
||||||
|
@instance.expects(:clear_nfs_exports).never
|
||||||
|
@instance.recover(@env)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "extracting folders" do
|
context "extracting folders" do
|
||||||
|
|
Loading…
Reference in New Issue