Removed mock_vm test helper, which is unnecessary

rujmah · Oct 4, 2010 · 3fe785a · 3fe785a
1 parent e5be4cc
commit 3fe785a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -23,15 +23,6 @@
 class Test::Unit::TestCase
   include Vagrant::TestHelpers
 
-  # Sets up the mocks for a VM
-  def mock_vm(env=nil)
-    env ||= vagrant_env
-    vm = Vagrant::VM.new
-    vm.stubs(:env).returns(env)
-    vm.stubs(:ssh).returns(Vagrant::SSH.new(vm.env))
-    vm
-  end
-
   # Sets up the mocks and stubs for a downloader
   def mock_downloader(downloader_klass)
     tempfile = mock("tempfile")

diff --git a/test/vagrant/provisioners/chef_server_test.rb b/test/vagrant/provisioners/chef_server_test.rb
@@ -2,8 +2,7 @@
 
 class ChefServerProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(vagrant_env)
-    @action_env.env.vm = mock_vm
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
     @action = Vagrant::Provisioners::ChefServer.new(@action_env)
     @env = @action.env

diff --git a/test/vagrant/provisioners/chef_solo_test.rb b/test/vagrant/provisioners/chef_solo_test.rb
@@ -2,8 +2,7 @@
 
 class ChefSoloProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(vagrant_env)
-    @action_env.env.vm = mock_vm
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
     @action = Vagrant::Provisioners::ChefSolo.new(@action_env)
     @env = @action.env

diff --git a/test/vagrant/provisioners/chef_test.rb b/test/vagrant/provisioners/chef_test.rb
@@ -2,8 +2,7 @@
 
 class ChefProvisionerTest < Test::Unit::TestCase
   setup do
-    @action_env = Vagrant::Action::Environment.new(vagrant_env)
-    @action_env.env.vm = mock_vm
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
     @action = Vagrant::Provisioners::Chef.new(@action_env)
     @env = @action.env

diff --git a/test/vagrant/ssh_test.rb b/test/vagrant/ssh_test.rb
@@ -2,12 +2,10 @@
 
 class SshTest < Test::Unit::TestCase
   def mock_ssh
-    @env = vagrant_env
+    @env = vagrant_env.vms[:default].env
     @network_adapters = []
     @vm = mock("vm")
     @vm.stubs(:network_adapters).returns(@network_adapters)
-
-    @env.stubs(:vm).returns(mock_vm(@env))
     @env.vm.stubs(:vm).returns(@vm)
 
     @ssh = Vagrant::SSH.new(@env)