vagrantup 0.6.9 → 0.7.0

data/templates/locales/en.yml

@@ -16,6 +16,9 @@ en:
       puppet_not_detected: |-
         The `puppet` binary was not found on the VM and is required for Puppet provisioning.
         Please verify that Puppet is installed and that the binary is available on the PATH.
+      puppetd_not_detected: |-
+        The `puppetd` binary was not found on the VM is required for Puppet Server provisioning.
+        Please verify that Puppet is installed and that the binary is available on the PATH.
       cli_missing_env: This command requires that a Vagrant environment be properly passed in as the last parameter.
       config_validation: |-
         There was a problem with the configuration of Vagrant. The error message(s)
@@ -28,10 +31,35 @@ en:
         this command in another directory. If you aren't in a home directory,
         then please rename ".vagrant" to something else, or configure Vagrant
         to use another filename by modifying `config.vagrant.dotfile_name`.
-      interrupted: Vagrant exited after cleanup due to external interrupt.
-      multi_vm_required: A multi-vm environment is required for name specification to this command.
-      multi_vm_target_required: `vagrant %{command}` requires a specific VM name to target in a multi-VM environment.
-      no_env: No Vagrant environment detected. Run `vagrant init` to set one up.
+      interrupted: "Vagrant exited after cleanup due to external interrupt."
+      multi_vm_required: "A multi-vm environment is required for name specification to this command."
+      multi_vm_target_required: "`vagrant %{command}` requires a specific VM name to target in a multi-VM environment."
+      no_env: "No Vagrant environment detected. Run `vagrant init` to set one up."
+      provisioner_equals_not_supported: |-
+        The `config.vm.provisioner =` syntax has been removed in Vagrant 0.7.0.
+        Please change your provisioners to use the new syntax described below.
+        All of these changes are reflected on the Vagrant website as well.
+
+        Before:
+
+          config.vm.provisioner = :chef_solo
+          config.chef.cookbooks_path = "my_cookbooks"
+          config.chef.add_recipe "apache"
+
+        After:
+
+          config.vm.provision :chef_solo, :cookbooks_path => "my_cookbooks",
+                                          :run_list => ["recipe[apache]"]
+
+        Instead of just a hash, you may use a block as well to get access to the
+        configuration object:
+
+          config.vm.provision :chef_solo do |chef|
+            chef.cookbooks_path = "my_cookbooks"
+            chef.add_recipe "apache"
+          end
+
+        This error message will be removed in later versions of Vagrant.
       ssh_authentication_failed: |-
         SSH authentication failed! This is typically caused by the public/private
         keypair for the SSH user not being properly set on the guest VM. Please
@@ -56,6 +84,10 @@ en:
         permissions on the following file to 0600 and then try running this command again:
 
         %{key_path}
+      ssh_port_not_detected: |-
+        Vagrant couldn't determine the SSH port for your VM! This is a rare,
+        exceptional event, and a bug should be filed. Please try recreating your
+        VM (vagrant destroy, then vagrant up). Sorry!
       ssh_unavailable: "`ssh` binary could not be found. Is an SSH client installed?"
       ssh_unavailable_windows: |-
         `vagrant ssh` isn't available on the Windows platform. The
@@ -89,15 +121,15 @@ en:
         message is reproduced below for convenience:
 
         %{file}
-      virtualbox_invalid_ose: |-
-        Vagrant has detected you're using an OSE ("Open Source Edition") of VirtualBox.
-        Vagrant currently doesn't support any of the OSE editions due to slight API
-        differences. Please download the regular package from virtualbox.org and install
-        to continue.
       virtualbox_invalid_version: |-
         Vagrant has detected that you have VirtualBox version %{version} installed!
-        Vagrant requires that you use at least VirtualBox version 3.2. Please install
+        Vagrant requires that you use at least VirtualBox version 4.0. Please install
         a more recent version of VirtualBox to continue.
+
+        The Vagrant 0.6.x series supports VirtualBox 3.2, so if you're stuck with that
+        version, then please use the 0.6.x series of Vagrant.
+
+        Any earlier versions of VirtualBox are completely unsupported. Please upgrade.
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently
@@ -137,6 +169,8 @@ en:
         box_missing: "A box must be specified."
         box_not_found: "The box '%{name}' could not be found."
         shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
+        provisioner_not_found: "The provisioner '%{shortcut}' doesn't exist."
+        provisioner_invalid_class: "The provisioner '%{shortcut}' must inherit from `Vagrant::Provisioners::Base`."
 
 #-------------------------------------------------------------------------------
 # Translations for commands. e.g. `vagrant x`
@@ -346,16 +380,15 @@ en:
             key.
           persisting: "Persisting the VM UUID (%{uuid})..."
         provision:
-          beginning: "Beginning provisioning process..."
+          beginning: "Running provisioner: %{provisioner}..."
           enabled: "Provisioning enabled with %{provisioner}..."
-          invalid_class: "Provisioners must be an instance of Vagrant::Provisioners::Base"
-          unknown_type: "Unknown provisioner type: %{provisioner}"
         resume:
           resuming: Resuming suspended VM...
         share_folders:
           creating: Creating shared folders metadata...
           mounting: Mounting shared folders...
           mounting_entry: "-- %{name}: %{guest_path}"
+          nomount_entry: "-- %{name}: Automounting disabled."
         suspend:
           suspending: Saving VM state and suspending execution...
 
@@ -365,7 +398,6 @@ en:
         download:
           with: "Downloading with %{class}..."
           cleaning: "Cleaning up downloaded box..."
-          copying: "Copying box to temporary location..."
           unknown_type: "Unknown or unsupported URI type given for box download."
         unpackage:
           extracting: "Extracting box..."
@@ -396,8 +428,10 @@ en:
 
     downloaders:
       file:
+        download: "Copying box to temporary location..."
         file_missing: "The specified path to a file doesn't exist."
       http:
+        download: "Downloading box: %{url}"
         socket_error: |-
           An error occurred while trying to download the specified box. This most
           often happens if there is no internet connection or the address is
@@ -442,23 +476,39 @@ en:
           could be because the PATH is not properly setup or perhaps Puppet is not
           installed on this guest. Puppet provisioning can not continue without
           Puppet properly installed.
-        running_puppet: "Running Puppet..."
-        manifest_to_run: "Puppet will use the %{manifest} manifest to configure your box."
+        running_puppet: "Running Puppet with %{manifest}..."
         manifest_missing: "The Puppet %{manifest} manifest is missing. You cannot configure this box."
+        manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
+        module_path_missing: "The configured module path doesn't exist: %{path}"
+
+      puppet_server:
+        not_detected: |-
+          The `%{binary}` binary appears to not be in the PATH of the guest. This
+          could be because the PATH is not properly setup or perhaps Puppet is not
+          installed on this guest. Puppet provisioning can not continue without
+          Puppet properly installed.
+        running_puppetd: "Running Puppet agent..."
 
     systems:
+      base:
+        unsupported_host_only: |-
+          Host only networking is very distro-specific. Vagrant has support for many
+          distros built-in: Debian, Ubuntu, Gentoo, and RedHat. The distro of your VM
+          couldn't be detected, or isn't supported for host only networking.
+
+          Most of the time this is simply due to the fact that no one has contributed
+          back the SSH commands necessary to set this up. Please report a bug and this
+          will be fixed for your distro.
+
       linux:
         attempting_halt: "Attempting graceful shutdown of linux..."
         mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
-        network_not_debian: |-
-          Host only networking is only supported for Debian/Ubuntu by the built-in
-          "Linux" system. If you're using some other distro and want to implement
-          host only networking, please subclass the `Vagrant::Systems::Linux` class
-          and implement the `prepare_host_only_network` and `enable_host_only_network`
-          methods.
-
-          Otherwise, please report your distro and how to modify network interfaces
-          to the Vagrant mailing list or IRC and we'll probably be glad to add it
-          to the internal systems.
+        mount_nfs_fail: |-
+          Mounting NFS shared folders failed. This is most often caused by the NFS
+          client software not being installed on the guest machine. Please verify
+          that the NFS client software is properly installed, and consult any resources
+          specific to the linux distro you're using for more information on how to
+          do this.
+
       solaris:
         attempting_halt: "Attempting graceful shutdown of solaris..."

data/templates/network_entry_gentoo.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+config_eth<%= net_options[:adapter] %>=("<%= net_options[:ip] %> netmask <%= net_options[:netmask] %>")
+#VAGRANT-END
+~            
+

data/templates/network_entry_redhat.erb

@@ -0,0 +1,8 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+BOOTPROTO=static
+DHCPCLASS=
+IPADDR=<%= net_options[:ip] %>
+NETMASK=<%= net_options[:netmask] %>
+#VAGRANT-END

data/templates/ssh_config.erb

@@ -1,5 +1,5 @@
 Host <%= host_key %>
-  HostName localhost
+  HostName 127.0.0.1
   User <%= ssh_user %>
   Port <%= ssh_port %>
   UserKnownHostsFile /dev/null

data/test/vagrant/action/vm/check_box_test.rb

@@ -45,6 +45,7 @@ class CheckBoxVMActionTest < Test::Unit::TestCase
       env.env.boxes.expects(:find).returns(nil)
       Vagrant::Box.expects(:add).with(env.env, env["config"].vm.box, env["config"].vm.box_url).in_sequence(seq)
       env.env.boxes.expects(:reload!).in_sequence(seq)
+      env.env.expects(:reload_config!).in_sequence(seq)
       app.expects(:call).with(env).once.in_sequence(seq)
 
       assert_nothing_raised {

data/test/vagrant/action/vm/clean_machine_folder_test.rb

@@ -37,10 +37,10 @@ class CleanMachineFolderVMActionTest < Test::Unit::TestCase
       @instance.clean_machine_folder
     end
 
-    should "delete directories with only .xml-prev files" do
+    should "delete directories with only .vbox-prev files" do
       folders = {
-        "sfoo" => %W[foo bar baz.xml-prev],
-        "sbar" => %W[foo.xml-prev]
+        "sfoo" => %W[foo bar baz.vbox-prev],
+        "sbar" => %W[foo.vbox-prev]
       }
 
       Dir.expects(:[]).with(@folder).returns(folders.keys)
@@ -57,7 +57,7 @@ class CleanMachineFolderVMActionTest < Test::Unit::TestCase
     should "delete directories with only subdirectories" do
       folders = {
         "sfoo" => %W[foo bar],
-        "sbar" => %W[foo.xml-prev]
+        "sbar" => %W[foo.vbox-prev]
       }
 
       File.stubs(:file?).returns(false)
@@ -77,6 +77,8 @@ class CleanMachineFolderVMActionTest < Test::Unit::TestCase
     should "do nothing if folder is < 10 characters" do
       VirtualBox::Global.global.system_properties.stubs(:default_machine_folder).returns("foo")
       Dir.expects(:[]).never
+
+      @instance.clean_machine_folder
     end
   end
 end

data/test/vagrant/action/vm/destroy_test.rb

@@ -16,7 +16,7 @@ class DestroyVMActionTest < Test::Unit::TestCase
 
   context "destroying the VM" do
     should "destroy VM and attached images" do
-      @internal_vm.expects(:destroy).with(:destroy_medium => :delete).once
+      @internal_vm.expects(:destroy).once
       @env["vm"].expects(:vm=).with(nil).once
       @app.expects(:call).with(@env).once
       @instance.call(@env)

data/test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb

@@ -16,24 +16,27 @@ class DestroyUnusedNetworkInterfacesVMActionTest < Test::Unit::TestCase
 
   context "calling" do
     setup do
-      @network_adapters = []
-      @internal_vm.stubs(:network_adapters).returns(@network_adapters)
+      @interfaces = []
+      global = mock("global")
+      host = mock("host")
+      VirtualBox::Global.stubs(:global).returns(global)
+      global.stubs(:host).returns(host)
+      host.stubs(:network_interfaces).returns(@interfaces)
     end
 
-    def stub_interface(length=5)
+    def stub_interface(length=5, type=:host_only)
       interface = mock("interface")
-      adapter = mock("adapter")
-      adapter.stubs(:host_interface_object).returns(interface)
+      interface.stubs(:interface_type).returns(type)
       interface.stubs(:attached_vms).returns(Array.new(length))
 
-      @network_adapters << adapter
+      @interfaces << interface
       interface
     end
 
     should "destroy only the unused network interfaces" do
       stub_interface(5)
       stub_interface(7)
-      results = [stub_interface(1), stub_interface(1)]
+      results = [stub_interface(0), stub_interface(0)]
 
       results.each do |result|
         result.expects(:destroy).once

data/test/vagrant/action/vm/nfs_test.rb

@@ -160,13 +160,19 @@ class NFSVMActionTest < Test::Unit::TestCase
     context "mounting folders" do
       setup do
         @instance.stubs(:host_ip).returns("foo")
-        @instance.stubs(:folders).returns(["bar"])
+        @instance.stubs(:folders).returns({ "v-data" => {:guestpath => "foo"}})
       end
 
       should "mount the folders on the system" do
         @vm.system.expects(:mount_nfs).with(@instance.host_ip, @instance.folders)
         @instance.mount_folders
       end
+
+      should "not mount folders which have no guest path" do
+        @instance.stubs(:folders).returns({ "v-data" => {}})
+        @vm.system.expects(:mount_nfs).with(@instance.host_ip, {})
+        @instance.mount_folders
+      end
     end
 
     context "getting the host IP" do

data/test/vagrant/action/vm/provision_test.rb

@@ -17,24 +17,23 @@ class ProvisionVMActionTest < Test::Unit::TestCase
 
   context "initializing" do
     setup do
-      @klass.any_instance.stubs(:load_provisioner)
+      @klass.any_instance.stubs(:load_provisioners)
     end
 
     should "load provisioner if provisioning enabled" do
-      @env["config"].vm.provisioner = :chef_solo
-      @klass.any_instance.expects(:load_provisioner).once
+      @env["config"].vm.provision :chef_solo
+      @klass.any_instance.expects(:load_provisioners).once
       @klass.new(@app, @env)
     end
 
     should "not load provisioner if disabled" do
-      @env["config"].vm.provisioner = nil
-      @klass.any_instance.expects(:load_provisioner).never
+      @klass.any_instance.expects(:load_provisioners).never
       @klass.new(@app, @env)
     end
 
     should "not load provisioner if disabled through env hash" do
       @env["provision.enabled"] = false
-      @klass.any_instance.expects(:load_provisioner).never
+      @klass.any_instance.expects(:load_provisioners).never
       @klass.new(@app, @env)
     end
   end
@@ -42,101 +41,47 @@ class ProvisionVMActionTest < Test::Unit::TestCase
   context "with an instance" do
     setup do
       # Set provisioner to nil so the provisioner isn't loaded on init
-      @env["config"].vm.provisioner = nil
+      @env["config"].vm.provisioners.clear
       @instance = @klass.new(@app, @env)
     end
 
     context "loading a provisioner" do
-      context "with a Class provisioner" do
-        setup do
-          @prov = mock("instance")
-          @prov.stubs(:is_a?).with(Vagrant::Provisioners::Base).returns(true)
-          @prov.stubs(:prepare)
-          @klass = mock("klass")
-          @klass.stubs(:is_a?).with(Class).returns(true)
-          @klass.stubs(:new).with(@env).returns(@prov)
-
-          @env["config"].vm.provisioner = @klass
-        end
-
-        should "set the provisioner to an instantiation of the class" do
-          @klass.expects(:new).with(@env).once.returns(@prov)
-          assert_equal @prov, @instance.load_provisioner
-        end
-
-        should "call prepare on the instance" do
-          @prov.expects(:prepare).once
-          @instance.load_provisioner
-        end
-
-        should "error environment if the class is not a subclass of the provisioner base" do
-          @prov.expects(:is_a?).with(Vagrant::Provisioners::Base).returns(false)
-
-          assert_raises(Vagrant::Errors::ProvisionInvalidClass) {
-            @instance.load_provisioner
-          }
-        end
+      setup do
+        Vagrant::Provisioners::ChefSolo.any_instance.expects(:prepare).at_least(0)
       end
 
-      context "with a Symbol provisioner" do
-        def provisioner_expectation(symbol, provisioner)
-          @env[:config].vm.provisioner = symbol
-
-          instance = mock("instance")
-          instance.expects(:prepare).once
-          provisioner.expects(:new).with(@env).returns(instance)
-          assert_equal instance, @instance.load_provisioner
-        end
-
-        should "raise an error if its an unknown symbol" do
-          @env["config"].vm.provisioner = :this_will_never_exist
+      should "instantiate and prepare each provisioner" do
+        @env["config"].vm.provision :chef_solo
+        @env["config"].vm.provision :chef_solo
+        @instance.load_provisioners
 
-          assert_raises(Vagrant::Errors::ProvisionUnknownType) {
-            @instance.load_provisioner
-          }
-        end
+        assert_equal 2, @instance.provisioners.length
+      end
 
-        should "set :chef_solo to the ChefSolo provisioner" do
-          provisioner_expectation(:chef_solo, Vagrant::Provisioners::ChefSolo)
+      should "set the config for each provisioner" do
+        @env["config"].vm.provision :chef_solo do |chef|
+          chef.cookbooks_path = "foo"
         end
 
-        should "set :chef_server to the ChefServer provisioner" do
-          provisioner_expectation(:chef_server, Vagrant::Provisioners::ChefServer)
-        end
+        @instance.load_provisioners
 
-        should "set :puppet to the Puppet provisioner" do
-          provisioner_expectation(:puppet, Vagrant::Provisioners::Puppet)
-        end
+        assert_equal "foo", @instance.provisioners.first.config.cookbooks_path
       end
     end
 
     context "calling" do
       setup do
         Vagrant::Provisioners::ChefSolo.any_instance.stubs(:prepare)
-        @env["config"].vm.provisioner = :chef_solo
-        @prov = @instance.load_provisioner
+        @env["config"].vm.provision :chef_solo
+        @instance.load_provisioners
       end
 
       should "provision and continue chain" do
         seq = sequence("seq")
         @app.expects(:call).with(@env).in_sequence(seq)
-        @prov.expects(:provision!).in_sequence(seq)
-
-        @instance.call(@env)
-      end
-
-      should "continue chain and not provision if not enabled" do
-        @env["config"].vm.provisioner = nil
-        @prov.expects(:provision!).never
-        @app.expects(:call).with(@env).once
-
-        @instance.call(@env)
-      end
-
-      should "continue chain and not provision if not enabled through env hash" do
-        @env["provision.enabled"] = false
-        @prov.expects(:provision!).never
-        @app.expects(:call).with(@env).once
+        @instance.provisioners.each do |prov|
+          prov.expects(:provision!).in_sequence(seq)
+        end
 
         @instance.call(@env)
       end

data/test/vagrant/action/vm/share_folders_test.rb

@@ -116,6 +116,7 @@ class ShareFoldersVMActionTest < Test::Unit::TestCase
       @folders = stub_shared_folders(<<-sf)
         config.vm.share_folder("foo", "fooguest", "foohost")
         config.vm.share_folder("bar", "barguest", "barhost")
+        config.vm.share_folder("foo_no_mount", nil, "foohost2")
       sf
       @ssh = mock("ssh")
       @vm.ssh.stubs(:execute).yields(@ssh)
@@ -125,7 +126,11 @@ class ShareFoldersVMActionTest < Test::Unit::TestCase
     should "mount all shared folders to the VM" do
       mount_seq = sequence("mount_seq")
       @folders.each do |name, data|
-        @vm.system.expects(:mount_shared_folder).with(@ssh, name, data[:guestpath]).in_sequence(mount_seq)
+        if data[:guestpath]
+          @vm.system.expects(:mount_shared_folder).with(@ssh, name, data[:guestpath]).in_sequence(mount_seq)
+        else
+          @vm.system.expects(:mount_shared_folder).with(@ssh, name, anything).never
+        end
       end
 
       @instance.mount_shared_folders

data/test/vagrant/command/helpers_test.rb

@@ -52,7 +52,7 @@ class CommandHelpersTest < Test::Unit::TestCase
       should "return the VM if no name is specified" do
         instance = command([], @env)
         assert_nothing_raised {
-          assert_equal @env.vms.values, instance.target_vms
+          assert_equal @env.vms.values.sort, instance.target_vms.sort
         }
       end
     end
@@ -64,7 +64,7 @@ class CommandHelpersTest < Test::Unit::TestCase
 
       should "return all the VMs if no name is specified" do
         instance = command([], @env)
-        assert_equal @env.vms.values, instance.target_vms
+        assert_equal @env.vms.values.sort, instance.target_vms.sort
       end
 
       should "return only the specified VM if a name is given" do

data/test/vagrant/config/base_test.rb

@@ -42,12 +42,6 @@ class ConfigBaseTest < Test::Unit::TestCase
         assert_equal @json, @base.to_json
       end
 
-      should "not include env in the JSON hash" do
-        @base.env = "FOO"
-        hash = @base.instance_variables_hash
-        assert !hash.has_key?(:env)
-      end
-
       should "not include top in the JSON hash" do
         @base.top = "FOO"
         hash = @base.instance_variables_hash

data/test/vagrant/config/vagrant_test.rb

@@ -8,7 +8,6 @@ class ConfigVagrantTest < Test::Unit::TestCase
   context "validation" do
     setup do
       @config.dotfile_name = "foo"
-      @config.home = "foo"
       @config.host = "foo"
 
       @errors = Vagrant::Config::ErrorRecorder.new
@@ -26,13 +25,6 @@ class ConfigVagrantTest < Test::Unit::TestCase
       assert !@errors.errors.empty?
     end
 
-    should "be invalid with no home" do
-      @config.home = nil
-
-      @config.validate(@errors)
-      assert !@errors.errors.empty?
-    end
-
     should "be invalid with no host" do
       @config.host = nil
 

data/test/vagrant/config/vm/provisioner_test.rb

@@ -0,0 +1,92 @@
+require "test_helper"
+
+class ConfigVMProvisionerTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Config::VMConfig::Provisioner
+    @top = Vagrant::Config::Top.new(nil)
+  end
+
+  context "initializing" do
+    should "expose the top instance that the provisioner belongs to" do
+      instance = @klass.new(@top, :chef_solo)
+      assert_equal @top, instance.top
+    end
+
+    should "expose the shortcut used" do
+      instance = @klass.new(@top, :chef_solo)
+      assert_equal :chef_solo, instance.shortcut
+    end
+
+    should "expose the provisioner class if its a valid shortcut" do
+      instance = @klass.new(@top, :chef_solo)
+      assert_equal Vagrant::Provisioners::ChefSolo, instance.provisioner
+    end
+
+    should "expose the provisioner class if its a valid class" do
+      instance = @klass.new(@top, Vagrant::Provisioners::ChefSolo)
+      assert_equal Vagrant::Provisioners::ChefSolo, instance.provisioner
+    end
+
+    should "have a nil provisioner class if invalid" do
+      instance = @klass.new(@top, :i_shall_never_exist)
+      assert_nil instance.provisioner
+    end
+
+    should "have a nil config instance if invalid" do
+      instance = @klass.new(@top, :i_shall_never_exist)
+      assert_nil instance.config
+    end
+
+    should "set the top of the config object to the given top" do
+      instance = @klass.new(@top, :chef_solo)
+      assert_equal @top, instance.config.top
+    end
+
+    should "configure the provisioner if valid" do
+      instance = @klass.new(@top, :chef_solo) do |chef|
+        chef.cookbooks_path = "foo"
+      end
+
+      assert_equal "foo", instance.config.cookbooks_path
+    end
+
+    should "configure the provisioner with a hash if valid" do
+      instance = @klass.new(@top, :chef_solo, :cookbooks_path => "foo")
+      assert_equal "foo", instance.config.cookbooks_path
+    end
+  end
+
+  context "validation" do
+    setup do
+      @errors = Vagrant::Config::ErrorRecorder.new
+    end
+
+    should "be invalid if provisioner is valid" do
+      instance = @klass.new(@top, :i_shall_never_exist)
+      instance.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if provisioner doesn't inherit from provisioners base" do
+      klass = Class.new
+      instance = @klass.new(@top, klass)
+      instance.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be valid with a valid provisioner" do
+      instance = @klass.new(@top, :chef_solo) do |chef|
+        chef.add_recipe "foo"
+      end
+
+      instance.validate(@errors)
+      assert @errors.errors.empty?
+    end
+
+    should "be invalid if a provisioner's config is invalid" do
+      instance = @klass.new(@top, :chef_solo)
+      instance.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+  end
+end

data/test/vagrant/config/vm_test.rb

@@ -75,4 +75,12 @@ class ConfigVMTest < Test::Unit::TestCase
       assert_equal @username, @config.shared_folder_gid
     end
   end
+
+  context "deprecated config" do
+    should "raise an error for provisioner=" do
+      assert_raises(Vagrant::Errors::VagrantError) {
+        @config.provisioner = :chef_solo
+      }
+    end
+  end
 end