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

Only destroy the VM if the exception raised is not a Vagrant error

This commit is contained in:
Mitchell Hashimoto 2010-09-14 00:48:31 -06:00
parent 7c42300002
commit 036edfcc2a
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/action/vm/import.rb
View File

@ -23,6 +23,8 @@ module Vagrant
def recover(env) def recover(env)
if env["vm"].created? if env["vm"].created?
return if env["vagrant.error"].is_a?(Errors::VagrantError)
# Interrupted, destroy the VM # Interrupted, destroy the VM
env["actions"].run(:destroy) env["actions"].run(:destroy)
end end

30
test/vagrant/action/vm/import_test.rb
View File

@ -40,15 +40,27 @@ class ImportVMActionTest < Test::Unit::TestCase
} }
end end
should "not run the destroy action on recover if VM is not created" do context "recovery" do
@env.env.vm.stubs(:created?).returns(false) setup do
@env.env.actions.expects(:run).never @env.env.vm.stubs(:created?).returns(true)
@instance.recover(@env) end
end
should "run the destroy action on recover" do should "not run the destroy action on recover if error is a VagrantError" do
@env.env.vm.stubs(:created?).returns(true) @env["vagrant.error"] = Vagrant::Errors::VMImportFailure.new
@env.env.actions.expects(:run).with(:destroy).once @env.env.actions.expects(:run).never
@instance.recover(@env) @instance.recover(@env)
end
should "not run the destroy action on recover if VM is not created" do
@env.env.vm.stubs(:created?).returns(false)
@env.env.actions.expects(:run).never
@instance.recover(@env)
end
should "run the destroy action on recover" do
@env.env.vm.stubs(:created?).returns(true)
@env.env.actions.expects(:run).with(:destroy).once
@instance.recover(@env)
end
end end
end end