vagrantup 0.5.4 → 0.6.0

data/test/vagrant/errors_test.rb

@@ -0,0 +1,42 @@
+require "test_helper"
+
+class ErrorsTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Errors::VagrantError
+    @super = Class.new(@klass) { error_namespace("vagrant.test.errors") }
+  end
+
+  should "set the given status code" do
+    klass = Class.new(@super) { status_code(4444) }
+    assert_equal 4444, klass.new.status_code
+  end
+
+  should "raise an error if attempting to set the same status code twice" do
+    klass = Class.new(@super) { status_code(4445) }
+
+    assert_raises(RuntimeError) {
+      Class.new(@super) { status_code(4445) }
+    }
+  end
+
+  should "translate the given message if non-hash is given" do
+    klass = Class.new(@super)
+    assert_equal I18n.t("vagrant.test.errors.test_key"), klass.new("test_key").message
+  end
+
+  should "use the alternate namespace if given" do
+    klass = Class.new(@super)
+    instance = klass.new(:_key => :test_key, :_namespace => "vagrant.test.alternate")
+    assert_equal I18n.t("vagrant.test.alternate.test_key"), instance.message
+  end
+
+  should "use the translation from I18n if specified" do
+    klass = Class.new(@super) { error_key(:test_key) }
+    assert_equal I18n.t("vagrant.test.errors.test_key"), klass.new.message
+  end
+
+  should "use the translation with the options specified if key given" do
+    klass = Class.new(@super) { error_key(:test_key_with_interpolation) }
+    assert_equal I18n.t("vagrant.test.errors.test_key_with_interpolation", :key => "yo"), klass.new(:key => "yo").message
+  end
+end

data/test/vagrant/hosts/base_test.rb

@@ -8,7 +8,7 @@ class BaseHostTest < Test::Unit::TestCase
   context "class methods" do
     context "loading" do
       setup do
-        @env = mock_environment
+        @env = vagrant_env
       end
 
       should "return detected class if klass is nil" do

data/test/vagrant/hosts/bsd_test.rb

@@ -3,11 +3,8 @@ require "test_helper"
 class BSDHostTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Hosts::BSD
-    @env = mock_environment
-    @env.stubs(:vm).returns(Vagrant::VM.new(:env => @env))
-    @env.logger.stubs(:info)
-
-    @instance = @klass.new(@env)
+    @env = vagrant_env
+    @instance = @klass.new(@env.vms.values.first.env)
   end
 
   context "supporting nfs check" do
@@ -40,7 +37,7 @@ class BSDHostTest < Test::Unit::TestCase
     should "output the lines of the rendered template" do
       output = %W[foo bar baz].join("\n")
       Vagrant::Util::TemplateRenderer.expects(:render).with("nfs/exports",
-                                                            :uuid => @env.vm.uuid,
+                                                            :uuid => @instance.env.vm.uuid,
                                                             :ip => @ip,
                                                             :folders => @folders).returns(output)
 

data/test/vagrant/hosts/linux_test.rb

@@ -3,11 +3,9 @@ require "test_helper"
 class LinuxHostTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Hosts::Linux
-    @env = mock_environment
-    @env.stubs(:vm).returns(Vagrant::VM.new(:env => @env))
-    @env.logger.stubs(:info)
+    @env = vagrant_env
 
-    @instance = @klass.new(@env)
+    @instance = @klass.new(@env.vms.values.first.env)
   end
 
   context "supporting nfs check" do
@@ -40,7 +38,7 @@ class LinuxHostTest < Test::Unit::TestCase
     should "output the lines of the rendered template" do
       output = %W[foo bar baz].join("\n")
       Vagrant::Util::TemplateRenderer.expects(:render).with("nfs/exports_linux",
-                                                            :uuid => @env.vm.uuid,
+                                                            :uuid => @instance.env.vm.uuid,
                                                             :ip => @ip,
                                                             :folders => @folders).returns(output)
 

data/test/vagrant/plugin_test.rb

@@ -0,0 +1,9 @@
+require "test_helper"
+
+class PluginTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Plugin
+  end
+
+  # This is a pretty tough class to test. TODO.
+end

data/test/vagrant/provisioners/base_test.rb

@@ -7,7 +7,7 @@ class BaseProvisionerTest < Test::Unit::TestCase
 
   context "base instance" do
     setup do
-      @env = Vagrant::Action::Environment.new(mock_environment)
+      @env = Vagrant::Action::Environment.new(vagrant_env)
       @base = Vagrant::Provisioners::Base.new(@env)
     end
 

data/test/vagrant/provisioners/chef_server_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class ChefServerProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(mock_environment)
+    @action_env = Vagrant::Action::Environment.new(vagrant_env)
     @action_env.env.vm = mock_vm
 
     @action = Vagrant::Provisioners::ChefServer.new(@action_env)
@@ -30,76 +30,72 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "not raise an exception if validation_key_path is set" do
-      @env = mock_environment do |config|
+      @env = vagrant_env(vagrantfile(<<-vf))
         config.chef.validation_key_path = "7"
-      end
+        config.chef.chef_server_url = "7"
+      vf
 
       @action.stubs(:env).returns(@env)
-
-      @action.prepare
-      assert !@action_env.error?
+      assert_nothing_raised { @action.prepare }
     end
 
-    should "eraise an exception if validation_key_path is nil" do
-      @env = mock_environment do |config|
+    should "raise an exception if validation_key_path is nil" do
+      @env = vagrant_env(vagrantfile(<<-vf))
         config.chef.validation_key_path = nil
-      end
+      vf
 
       @action.stubs(:env).returns(@env)
 
-      @action.prepare
-      assert @action_env.error?
-      assert_equal :chef_server_validation_key_required, @action_env.error.first
+      assert_raises(Vagrant::Provisioners::Chef::ChefError) {
+        @action.prepare
+      }
     end
 
     should "not raise an exception if validation_key_path does exist" do
-      @env = mock_environment do |config|
-        config.chef.validation_key_path = "7"
-      end
+      @env = vagrant_env(vagrantfile(<<-vf))
+        config.chef.validation_key_path = "#{vagrantfile(tmp_path)}"
+        config.chef.chef_server_url = "7"
+      vf
 
       @action.stubs(:env).returns(@env)
-      @action.stubs(:validation_key_path).returns("9")
-
-      File.expects(:file?).with(@action.validation_key_path).returns(true)
-      @action.prepare
-      assert !@action_env.error?
+      assert_nothing_raised { @action.prepare }
     end
 
     should "raise an exception if validation_key_path doesn't exist" do
-      @env = mock_environment do |config|
+      @env = vagrant_env(vagrantfile(<<-vf))
         config.chef.validation_key_path = "7"
-      end
+        config.chef.chef_server_url = "7"
+      vf
 
       @action.stubs(:env).returns(@env)
       @action.stubs(:validation_key_path).returns("9")
 
       File.expects(:file?).with(@action.validation_key_path).returns(false)
-      @action.prepare
-      assert @action_env.error?
-      assert_equal :chef_server_validation_key_doesnt_exist, @action_env.error.first
+      assert_raises(Vagrant::Provisioners::Chef::ChefError) {
+        @action.prepare
+      }
     end
 
     should "not raise an exception if chef_server_url is set" do
-      @env = mock_environment do |config|
+      @env = vagrant_env(vagrantfile(<<-vf))
+        config.chef.validation_key_path = "#{vagrantfile(tmp_path)}"
         config.chef.chef_server_url = "7"
-      end
+      vf
 
       @action.stubs(:env).returns(@env)
-
-      @action.prepare
-      assert !@action_env.error?
+      assert_nothing_raised { @action.prepare }
     end
 
     should "raise an exception if chef_server_url is nil" do
-      @env = mock_environment do |config|
+      @env = vagrant_env(vagrantfile(<<-vf))
         config.chef.chef_server_url = nil
-      end
+      vf
 
       @action.stubs(:env).returns(@env)
 
-      @action.prepare
-      assert @action_env.error?
-      assert_equal :chef_server_url_required, @action_env.error.first
+      assert_raises(Vagrant::Provisioners::Chef::ChefError) {
+        @action.prepare
+      }
     end
   end
 

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class ChefSoloProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(mock_environment)
+    @action_env = Vagrant::Action::Environment.new(vagrant_env)
     @action_env.env.vm = mock_vm
 
     @action = Vagrant::Provisioners::ChefSolo.new(@action_env)

data/test/vagrant/provisioners/chef_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class ChefProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(mock_environment)
+    @action_env = Vagrant::Action::Environment.new(vagrant_env)
     @action_env.env.vm = mock_vm
 
     @action = Vagrant::Provisioners::Chef.new(@action_env)
@@ -12,9 +12,9 @@ class ChefProvisionerTest < Test::Unit::TestCase
 
   context "preparing" do
     should "error the environment" do
-      @action.prepare
-      assert @action_env.error?
-      assert_equal :chef_base_invalid_provisioner, @action_env.error.first
+      assert_raises(Vagrant::Provisioners::Chef::ChefError) {
+        @action.prepare
+      }
     end
   end
 
@@ -25,8 +25,8 @@ class ChefProvisionerTest < Test::Unit::TestCase
     end
 
     should "not include the 'json' key in the config dump" do
-      result = JSON.parse(@config.to_json)
-      assert !result.has_key?("json")
+      result = @config.to_json
+      assert result !~ /"json":/
     end
 
     should "provide accessors to the run list" do
@@ -73,7 +73,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
 
     should "verify binary exists" do
       binary = "foo"
-      @ssh.expects(:exec!).with("which #{binary}", :error_key => :chef_not_detected, :error_data => { :binary => binary }).once
+      @ssh.expects(:exec!).with("which #{binary}", anything)
       @action.verify_binary(binary)
     end
   end

data/test/vagrant/ssh_session_test.rb

@@ -19,21 +19,14 @@ class SshSessionTest < Test::Unit::TestCase
 
   context "checking exit status" do
     should "raise an ActionException if its non-zero" do
-      assert_raises(Vagrant::Action::ActionException) {
+      assert_raises(Vagrant::Errors::VagrantError) {
         @instance.check_exit_status(1, "foo")
       }
     end
 
     should "raise the given exception if specified" do
-      options = {
-        :error_key => :foo,
-        :error_data => {}
-      }
-      result = Exception.new
-      Vagrant::Action::ActionException.expects(:new).with(options[:error_key], options[:error_data]).once.returns(result)
-
-      assert_raises(Exception) {
-        @instance.check_exit_status(1, "foo", options)
+      assert_raises(Vagrant::Errors::BaseVMNotFound) {
+        @instance.check_exit_status(1, "foo", :_error_class => Vagrant::Errors::BaseVMNotFound)
       }
     end
 

data/test/vagrant/ssh_test.rb

@@ -2,11 +2,7 @@ require "test_helper"
 
 class SshTest < Test::Unit::TestCase
   def mock_ssh
-    @env = mock_environment do |config|
-      yield config if block_given?
-    end
-
-    @forwarded_ports = []
+    @env = vagrant_env
     @network_adapters = []
     @vm = mock("vm")
     @vm.stubs(:network_adapters).returns(@network_adapters)
@@ -18,14 +14,13 @@ class SshTest < Test::Unit::TestCase
   end
 
   setup do
-    VirtualBox.stubs(:version).returns("3.1.4")
+    VirtualBox.stubs(:version).returns("3.2.4")
   end
 
   context "connecting to external SSH" do
     setup do
       mock_ssh
       @ssh.stubs(:check_key_permissions)
-      @ssh.stubs(:error_and_exit)
       Kernel.stubs(:exec)
 
       Vagrant::Util::Platform.stubs(:leopard?).returns(false)
@@ -68,6 +63,10 @@ class SshTest < Test::Unit::TestCase
         Vagrant::Util::Platform.stubs(:leopard?).returns(true)
       end
 
+      teardown do
+        Vagrant::Util::Platform.stubs(:leopard?).returns(false)
+      end
+
       should "fork, exec, and wait" do
         pid = mock("pid")
         @ssh.expects(:fork).once.returns(pid)
@@ -78,18 +77,18 @@ class SshTest < Test::Unit::TestCase
     end
 
     context "checking windows" do
+      teardown do
+        Mario::Platform.forced = Mario::Platform::Linux
+      end
+
       should "error and exit if the platform is windows" do
-        Mario::Platform.expects(:windows?).returns(true)
-        @ssh.expects(:error_and_exit).with do |error_name, opts|
-          opts[:key_path] && opts[:ssh_port]
-        end
-        @ssh.connect
+        Mario::Platform.forced = Mario::Platform::Windows7
+        assert_raises(Vagrant::Errors::SSHUnavailableWindows) { @ssh.connect }
       end
 
       should "not error and exit if the platform is anything other that windows" do
-        Mario::Platform.expects(:windows?).returns(false)
-        @ssh.expects(:error_and_exit).never
-        @ssh.connect
+        Mario::Platform.forced = Mario::Platform::Linux
+        assert_nothing_raised { @ssh.connect }
       end
     end
 
@@ -171,13 +170,6 @@ class SshTest < Test::Unit::TestCase
       @ssh.expects(:execute).yields(ssh).once
       @ssh.upload!("foo", "bar")
     end
-
-    should "retry 5 times" do
-      @ssh.expects(:execute).times(5).raises(IOError)
-      assert_raises(IOError) {
-        @ssh.upload!("foo", "bar")
-      }
-    end
   end
 
   context "checking if host is up" do
@@ -205,7 +197,7 @@ class SshTest < Test::Unit::TestCase
     end
 
     should "return false if the connection is refused" do
-      Net::SSH.expects(:start).raises(Errno::ECONNREFUSED)
+      Net::SSH.expects(:start).times(5).raises(Errno::ECONNREFUSED)
       assert_nothing_raised {
         assert !@ssh.up?
       }
@@ -225,8 +217,7 @@ class SshTest < Test::Unit::TestCase
 
     should "error and exit if a Net::SSH::AuthenticationFailed is raised" do
       @ssh.expects(:execute).raises(Net::SSH::AuthenticationFailed)
-      @ssh.expects(:error_and_exit).with(:vm_ssh_auth_failed).once
-      @ssh.up?
+      assert_raises(Vagrant::Errors::SSHAuthenticationFailed) { @ssh.up? }
     end
   end
 
@@ -252,11 +243,15 @@ class SshTest < Test::Unit::TestCase
       @stat.stubs(:owned?).returns(true)
       File.stubs(:stat).returns(@stat)
 
-      Mario::Platform.stubs(:windows?).returns(false)
+      Mario::Platform.forced = Mario::Platform::Linux
+    end
+
+    teardown do
+      Mario::Platform.forced = Mario::Platform::Linux
     end
 
     should "do nothing if on windows" do
-      Mario::Platform.stubs(:windows?).returns(true)
+      Mario::Platform.forced = Mario::Platform::Windows7
       File.expects(:stat).never
       @ssh.check_key_permissions(@key_path)
     end
@@ -278,8 +273,7 @@ class SshTest < Test::Unit::TestCase
       @ssh.expects(:file_perms).returns("900").in_sequence(perm_sequence)
       File.expects(:chmod).with(0600, @key_path).once.in_sequence(perm_sequence)
       @ssh.expects(:file_perms).returns("600").in_sequence(perm_sequence)
-      @ssh.expects(:error_and_exit).never
-      @ssh.check_key_permissions(@key_path)
+      assert_nothing_raised { @ssh.check_key_permissions(@key_path) }
     end
 
     should "error and exit if the resulting chmod doesn't work" do
@@ -287,15 +281,13 @@ class SshTest < Test::Unit::TestCase
       @ssh.expects(:file_perms).returns("900").in_sequence(perm_sequence)
       File.expects(:chmod).with(0600, @key_path).once.in_sequence(perm_sequence)
       @ssh.expects(:file_perms).returns("900").in_sequence(perm_sequence)
-      @ssh.expects(:error_and_exit).once.with(:ssh_bad_permissions, :key_path => @key_path).in_sequence(perm_sequence)
-      @ssh.check_key_permissions(@key_path)
+      assert_raises(Vagrant::Errors::SSHKeyBadPermissions) { @ssh.check_key_permissions(@key_path) }
     end
 
     should "error and exit if a bad file perm is raised" do
       @ssh.expects(:file_perms).with(@key_path).returns("900")
       File.expects(:chmod).raises(Errno::EPERM)
-      @ssh.expects(:error_and_exit).once.with(:ssh_bad_permissions, :key_path => @key_path)
-      @ssh.check_key_permissions(@key_path)
+      assert_raises(Vagrant::Errors::SSHKeyBadPermissions) { @ssh.check_key_permissions(@key_path) }
     end
   end