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

Import uses the string path, rather than the pathname

This commit is contained in:
Mitchell Hashimoto 2010-09-12 16:37:43 -06:00
parent 714c94780c
commit 4b8878f5f7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ module Vagrant
env.ui.info "vagrant.actions.vm.import.importing", :name => env.env.box.name
# Import the virtual machine
env.env.vm.vm = VirtualBox::VM.import(env.env.box.ovf_file) do |progress|
env.env.vm.vm = VirtualBox::VM.import(env.env.box.ovf_file.to_s) do |progress|
env.ui.report_progress(progress.percent, 100, false)
end

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

@ -2,15 +2,15 @@ require "test_helper"
class ImportVMActionTest < Test::Unit::TestCase
setup do
@klass = Vagrant::Action::VM::Import
@app, @env = action_env
@instance = @klass.new(@app, @env)
clean_paths
vagrant_box("foo")
ovf_file = "foo"
@box = mock("box")
@box.stubs(:name).returns("foo")
@box.stubs(:ovf_file).returns(ovf_file)
@env.env.stubs(:box).returns(@box)
@klass = Vagrant::Action::VM::Import
@app, @env = action_env(vagrant_env(vagrantfile(<<-vf)))
config.vm.box = "foo"
vf
@instance = @klass.new(@app, @env)
@env.env.vm = Vagrant::VM.new(:env => @env.env, :name => "foobar")
@ -21,7 +21,7 @@ class ImportVMActionTest < Test::Unit::TestCase
end
should "call import on VirtualBox with proper base" do
VirtualBox::VM.expects(:import).once.with(@env.env.box.ovf_file).returns(@vm)
VirtualBox::VM.expects(:import).once.with(@env.env.box.ovf_file.to_s).returns(@vm)
@instance.call(@env)
end