Moved the root shared folder to load in the start task.

This commit is contained in:
Mitchell Hashimoto 2010-02-25 23:57:50 -08:00
parent 815b253b7e
commit 9e41bd9a34
4 changed files with 12 additions and 10 deletions

View File

@ -17,6 +17,11 @@ error
end end
end end
def collect_shared_folders
# The root shared folder for the project
["vagrant-root", Env.root_path, Vagrant.config.vm.project_directory]
end
def boot def boot
logger.info "Booting VM..." logger.info "Booting VM..."
@runner.vm.start(:headless, true) @runner.vm.start(:headless, true)

View File

@ -14,11 +14,6 @@ module Vagrant
end end
end end
def collect_shared_folders
# The root shared folder for the project
["vagrant-root", Env.root_path, Vagrant.config.vm.project_directory]
end
def after_import def after_import
persist persist
setup_mac_address setup_mac_address

View File

@ -45,4 +45,11 @@ class StartActionTest < Test::Unit::TestCase
assert !@action.wait_for_boot(0) assert !@action.wait_for_boot(0)
end end
end end
context "callbacks" do
should "setup the root directory shared folder" do
expected = ["vagrant-root", Vagrant::Env.root_path, Vagrant.config.vm.project_directory]
assert_equal expected, @action.collect_shared_folders
end
end
end end

View File

@ -52,11 +52,6 @@ class UpActionTest < Test::Unit::TestCase
@action.expects(:setup_mac_address).once.in_sequence(boot_seq) @action.expects(:setup_mac_address).once.in_sequence(boot_seq)
@action.after_import @action.after_import
end end
should "setup the root directory shared folder" do
expected = ["vagrant-root", Vagrant::Env.root_path, Vagrant.config.vm.project_directory]
assert_equal expected, @action.collect_shared_folders
end
end end
context "persisting" do context "persisting" do