Box verification actually raises error to undo box adding
This commit is contained in:
parent
3e36b4ce12
commit
376cd2f24d
|
@ -23,9 +23,8 @@ module Vagrant
|
||||||
def verify_appliance
|
def verify_appliance
|
||||||
# We now try to read the applince. If it succeeds, we return true.
|
# We now try to read the applince. If it succeeds, we return true.
|
||||||
VirtualBox::Appliance.new(@runner.ovf_file)
|
VirtualBox::Appliance.new(@runner.ovf_file)
|
||||||
true
|
|
||||||
rescue VirtualBox::Exceptions::FileErrorException
|
rescue VirtualBox::Exceptions::FileErrorException
|
||||||
false
|
raise ActionException.new(:box_verification_failed)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
|
|
||||||
The box must be added through the `vagrant box add` command. Please view
|
The box must be added through the `vagrant box add` command. Please view
|
||||||
the documentation associated with the command for more information.
|
the documentation associated with the command for more information.
|
||||||
|
:box_verification_failed: |-
|
||||||
|
The specified box is invalid. This can commonly be attributed to incorrectly
|
||||||
|
typing in the path to the box or invalid packaging of the box.
|
||||||
:box_not_specified: |-
|
:box_not_specified: |-
|
||||||
No base box was specified! A base box is required as a staring point
|
No base box was specified! A base box is required as a staring point
|
||||||
for every vagrant virtual machine. Please specify one in your Vagrantfile
|
for every vagrant virtual machine. Please specify one in your Vagrantfile
|
||||||
|
|
|
@ -33,12 +33,12 @@ class VerifyBoxActionTest < Test::Unit::TestCase
|
||||||
|
|
||||||
should "create new appliance and return true if succeeds" do
|
should "create new appliance and return true if succeeds" do
|
||||||
VirtualBox::Appliance.expects(:new).with(@runner.ovf_file)
|
VirtualBox::Appliance.expects(:new).with(@runner.ovf_file)
|
||||||
assert @action.verify_appliance
|
assert_nothing_raised { @action.verify_appliance }
|
||||||
end
|
end
|
||||||
|
|
||||||
should "return false if an exception is raised" do
|
should "return false if an exception is raised" do
|
||||||
VirtualBox::Appliance.expects(:new).with(@runner.ovf_file).raises(VirtualBox::Exceptions::FileErrorException)
|
VirtualBox::Appliance.expects(:new).with(@runner.ovf_file).raises(VirtualBox::Exceptions::FileErrorException)
|
||||||
assert !@action.verify_appliance
|
assert_raises(Vagrant::Actions::ActionException) { @action.verify_appliance }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue