vagrantup 0.5.4 → 0.6.0

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

@@ -3,7 +3,7 @@ require "test_helper"
 class BootVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::Boot
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @vm.stubs(:ssh).returns(mock("ssh"))
@@ -16,14 +16,6 @@ class BootVMActionTest < Test::Unit::TestCase
   end
 
   context "calling" do
-    should "do nothing if environment is erroneous" do
-      @env.error!(:foo)
-      @instance.expects(:boot).never
-      @app.expects(:call).never
-
-      @instance.call(@env)
-    end
-
     should "run the proper methods on success" do
       boot_seq = sequence("boot_seq")
       @instance.expects(:boot).in_sequence(boot_seq)
@@ -37,18 +29,9 @@ class BootVMActionTest < Test::Unit::TestCase
       @instance.expects(:boot).in_sequence(boot_seq)
       @instance.expects(:wait_for_boot).returns(false).in_sequence(boot_seq)
       @app.expects(:call).never
-      @instance.call(@env)
-    end
-
-    should "not continue chain if error occured" do
-      boot_seq = sequence("boot_seq")
-      @instance.expects(:boot).in_sequence(boot_seq)
-      @instance.expects(:wait_for_boot).returns(true).in_sequence(boot_seq).with() do
-        @env.error!(:interrupt)
-        true
-      end
-      @app.expects(:call).never
-      @instance.call(@env)
+      assert_raises(Vagrant::Errors::VMFailedToBoot) {
+        @instance.call(@env)
+      }
     end
   end
 
@@ -70,7 +53,7 @@ class BootVMActionTest < Test::Unit::TestCase
     end
 
     should "return right away if interrupted" do
-      @env.error!(:interrupt)
+      @env.interrupt!
       @vm.ssh.expects(:up?).times(1).returns(false)
       assert @instance.wait_for_boot
     end

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

@@ -3,46 +3,56 @@ require 'test_helper'
 class CheckBoxVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::CheckBox
-    @app, @env = mock_action_data
-    @instance = @klass.new(@app, @env)
   end
 
   context "calling" do
     setup do
-      Vagrant::Box.stubs(:find)
     end
 
-    should "return error if box not specified" do
-      @env.env.config.vm.box = nil
+    should "raise error if box not specified" do
+      app, env = action_env(vagrant_env(vagrantfile(<<-vf)))
+        config.vm.box = nil
+      vf
 
-      @app.expects(:call).never
-      @instance.call(@env)
+      instance = @klass.new(app, env)
+      app.expects(:call).never
 
-      assert @env.error?
-      assert_equal :box_not_specified, @env.error.first
+      assert_raises(Vagrant::Errors::BoxNotSpecified) {
+        instance.call(env)
+      }
     end
 
     should "error if box does not exist and URL not specified" do
-      @env.env.config.vm.box_url = nil
-      Vagrant::Box.expects(:find).with(@env.env, @env["config"].vm.box).returns(nil)
-
-      @app.expects(:call).never
-      @instance.call(@env)
-
-      assert @env.error?
-      assert_equal :box_specified_doesnt_exist, @env.error.first
+      app, env = action_env(vagrant_env(vagrantfile(<<-vf)))
+        config.vm.box = "yo"
+        config.vm.box_url = nil
+      vf
+
+      instance = @klass.new(app, env)
+      app.expects(:call).never
+      env.env.boxes.expects(:find).with(env["config"].vm.box).returns(nil)
+
+      assert_raises(Vagrant::Errors::BoxSpecifiedDoesntExist) {
+        instance.call(env)
+      }
     end
 
     should "attempt to download box and continue if URL specified" do
+      app, env = action_env(vagrant_env(vagrantfile(<<-vf)))
+        config.vm.box = "yo"
+        config.vm.box_url = "http://google.com"
+      vf
+
+      instance = @klass.new(app, env)
       seq = sequence("seq")
-      @env.env.config.vm.box_url = "bar"
-      Vagrant::Box.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.expects(:load_box!).in_sequence(seq)
-      @app.expects(:call).with(@env).once.in_sequence(seq)
-
-      @instance.call(@env)
-      assert !@env.error?
+      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.expects(:load_box!).in_sequence(seq)
+      app.expects(:call).with(env).once.in_sequence(seq)
+
+      assert_nothing_raised {
+        instance.call(env)
+      }
     end
   end
 end

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

@@ -3,7 +3,7 @@ require "test_helper"
 class CleanMachineFolderVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::CleanMachineFolder
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @instance = @klass.new(@app, @env)
   end

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

@@ -3,7 +3,7 @@ require "test_helper"
 class ClearForwardedPortsVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::ClearForwardedPorts
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @vm.stubs(:name).returns("foo")

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

@@ -3,7 +3,7 @@ require "test_helper"
 class ClearNFSExportsActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::ClearNFSExports
-    @app, @env = mock_action_data
+    @app, @env = action_env
     @env.env.stubs(:host).returns(Vagrant::Hosts::Base.new(@env))
 
     @instance = @klass.new(@app, @env)

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

@@ -3,7 +3,7 @@ require "test_helper"
 class ClearSharedFoldersVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::ClearSharedFolders
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env["vm"] = @vm

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

@@ -3,7 +3,7 @@ require "test_helper"
 class CustomizeVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::Customize
-    @app, @env = mock_action_data
+    @app, @env = action_env
     @instance = @klass.new(@app, @env)
 
     @vm = mock("vm")
@@ -14,6 +14,7 @@ class CustomizeVMActionTest < Test::Unit::TestCase
   end
 
   should "not run anything if no customize blocks exist" do
+    @env.env.config.vm.proc_stack.clear
     @internal_vm.expects(:save).never
     @app.expects(:call).with(@env).once
     @instance.call(@env)

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

@@ -3,7 +3,7 @@ require "test_helper"
 class DestroyVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::Destroy
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env["vm"] = @vm
@@ -18,7 +18,6 @@ class DestroyVMActionTest < Test::Unit::TestCase
     should "destroy VM and attached images" do
       @internal_vm.expects(:destroy).with(:destroy_medium => :delete).once
       @env["vm"].expects(:vm=).with(nil).once
-      @env.env.expects(:update_dotfile).once
       @app.expects(:call).with(@env).once
       @instance.call(@env)
     end

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

@@ -3,7 +3,7 @@ require "test_helper"
 class DestroyUnusedNetworkInterfacesVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::DestroyUnusedNetworkInterfaces
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env["vm"] = @vm

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

@@ -3,12 +3,13 @@ require "test_helper"
 class DisableNetworksVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::DisableNetworks
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env.env.stubs(:vm).returns(@vm)
 
     @internal_vm = mock("internal")
+    @vm.stubs(:created?).returns(true)
     @vm.stubs(:vm).returns(@internal_vm)
     @internal_vm.stubs(:network_adapters).returns([])
 
@@ -27,6 +28,14 @@ class DisableNetworksVMActionTest < Test::Unit::TestCase
     @internal_vm.network_adapters << adapter
   end
 
+  should "do nothing if VM is not created" do
+    @vm.stubs(:created?).returns(false)
+    @vm.expects(:vm).never
+
+    @app.expects(:call).with(@env).once
+    @instance.call(@env)
+  end
+
   should "remove all network adapters and continue chain" do
     mock_adapter(:bridged)
     mock_adapter(:host_only)

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

@@ -3,7 +3,7 @@ require "test_helper"
 class DiscardStateVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::DiscardState
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env["vm"] = @vm
@@ -16,11 +16,20 @@ class DiscardStateVMActionTest < Test::Unit::TestCase
 
   context "calling" do
     setup do
+      @vm.stubs(:created?).returns(true)
       @internal_vm.stubs(:saved?).returns(false)
     end
 
+    should "do nothing if the VM is not created" do
+      @vm.stubs(:created?).returns(false)
+      @internal_vm.expects(:discard_state).never
+      @app.expects(:call).with(@env).once
+      @instance.call(@env)
+    end
+
     should "do nothing if not saved and continue chain" do
       @internal_vm.expects(:saved?).returns(false)
+      @internal_vm.expects(:discard_state).never
       @app.expects(:call).with(@env).once
       @instance.call(@env)
     end

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

@@ -3,7 +3,7 @@ require "test_helper"
 class ExportVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::Export
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @env["vm"] = @vm
@@ -24,7 +24,7 @@ class ExportVMActionTest < Test::Unit::TestCase
       @instance.expects(:setup_temp_dir).in_sequence(seq)
       @instance.expects(:export).in_sequence(seq)
       @app.expects(:call).with(@env).in_sequence(seq)
-      @instance.expects(:cleanup).in_sequence(seq)
+      @instance.expects(:recover).in_sequence(seq).with(@env)
 
       @instance.call(@env)
     end
@@ -34,36 +34,11 @@ class ExportVMActionTest < Test::Unit::TestCase
       @instance.expects(:setup_temp_dir).never
       @instance.expects(:export).never
       @app.expects(:call).with(@env).never
-      @instance.expects(:cleanup).never
+      @instance.expects(:recover).never
 
-      @instance.call(@env)
-      assert @env.error?
-      assert_equal :vm_power_off_to_package, @env.error.first
-    end
-
-    should "halt the chain if env error" do
-      @internal_vm.stubs(:powered_off?).returns(true)
-      @instance.expects(:setup_temp_dir).never
-      @instance.expects(:export).never
-      @app.expects(:call).with(@env).never
-      @instance.expects(:cleanup).never
-
-      @env.error!(:interrupt)
-      @instance.call(@env)
-    end
-
-    should "halt the chain if env error when call is reached" do
-      @internal_vm.stubs(:powered_off?).returns(true)
-      @instance.expects(:setup_temp_dir).once
-      @instance.expects(:export).once.with() do
-        @env.error!(:interrupt)
-        true
-      end
-
-      @app.expects(:call).with(@env).never
-      @instance.expects(:cleanup).once
-
-      @instance.call(@env)
+      assert_raises(Vagrant::Errors::VMPowerOffToPackage) {
+        @instance.call(@env)
+      }
     end
   end
 
@@ -76,13 +51,13 @@ class ExportVMActionTest < Test::Unit::TestCase
 
     should "delete the temporary file if it exists" do
       File.expects(:unlink).with(@temp_dir).once
-      @instance.cleanup
+      @instance.recover(nil)
     end
 
     should "not delete anything if it doesn't exist" do
       File.stubs(:exist?).returns(false)
       File.expects(:unlink).never
-      @instance.cleanup
+      @instance.recover(nil)
     end
   end
 
@@ -91,10 +66,7 @@ class ExportVMActionTest < Test::Unit::TestCase
       @time_now = Time.now.to_i.to_s
       Time.stubs(:now).returns(@time_now)
 
-      @tmp_path = "foo"
-      @env.env.stubs(:tmp_path).returns(@tmp_path)
-
-      @temp_dir = File.join(@env.env.tmp_path, @time_now)
+      @temp_dir = @env.env.tmp_path.join(@time_now)
       FileUtils.stubs(:mkpath)
     end
 

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

@@ -3,11 +3,11 @@ require "test_helper"
 class ForwardPortsHelpersVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Class.new do
+      include Vagrant::Action::VM::ForwardPortsHelpers
       def initialize(env); @env = env; end
     end
 
-    @klass.send(:include, Vagrant::Action::VM::ForwardPortsHelpers)
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @vm.stubs(:name).returns("foo")

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

@@ -3,7 +3,7 @@ require "test_helper"
 class ForwardPortsVMActionTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Action::VM::ForwardPorts
-    @app, @env = mock_action_data
+    @app, @env = action_env
 
     @vm = mock("vm")
     @vm.stubs(:name).returns("foo")
@@ -26,16 +26,19 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
     should "error if has a port below threshold" do
       @env.env.config.vm.forwarded_ports.clear
       @env.env.config.vm.forward_port("foo", 22, 222)
-      @klass.new(@app, @env)
-      assert @env.error?
-      assert_equal :vm_port_below_threshold, @env.error.first
+
+      assert_raises(Vagrant::Errors::ForwardPortBelowThreshold) {
+        @klass.new(@app, @env)
+      }
     end
 
     should "not error if ports are fine" do
       @env.env.config.vm.forwarded_ports.clear
       @env.env.config.vm.forward_port("foo", 22, 2222)
-      @klass.new(@app, @env)
-      assert !@env.error?
+
+      assert_nothing_raised {
+        @klass.new(@app, @env)
+      }
     end
   end
 
@@ -51,15 +54,13 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
 
     should "not raise any errors if no forwarded ports collide" do
       @used_ports << "80"
-      @klass.new(@app, @env)
-      assert !@env.error?
+      assert_nothing_raised { @klass.new(@app, @env) }
     end
 
     should "handle collision if it happens" do
       @used_ports << "2222"
       @klass.any_instance.expects(:handle_collision).with("ssh", anything, anything).once
-      @klass.new(@app, @env)
-      assert !@env.error?
+      assert_nothing_raised { @klass.new(@app, @env) }
     end
   end
 
@@ -84,9 +85,10 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
 
       should "error if auto forwarding is disabled" do
         @options[:auto] = false
-        @instance.handle_collision(@name, @options, @used_ports)
-        assert @env.error?
-        assert_equal :vm_port_collision, @env.error.first
+
+        assert_raises(Vagrant::Errors::ForwardPortCollision) {
+          @instance.handle_collision(@name, @options, @used_ports)
+        }
       end
 
       should "set the host port to the first available port" do
@@ -111,9 +113,10 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
 
       should "raise an exception if there are no auto ports available" do
         @env.env.config.vm.auto_port_range = (1..3)
-        @instance.handle_collision(@name, @options, @used_ports)
-        assert @env.error?
-        assert_equal :vm_port_auto_empty, @env.error.first
+
+        assert_raises(Vagrant::Errors::ForwardPortAutolistEmpty) {
+          @instance.handle_collision(@name, @options, @used_ports)
+        }
       end
     end