From 8e82fb26918189594444c6f43f7bb48526687521 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 19 Jul 2010 20:32:07 -0700
Subject: [PATCH] Fix tests so they run on Ruby 1.9.2

---
 test/test_helper.rb                                           | 4 +++-
 test/vagrant/action/box/destroy_test.rb                       | 2 +-
 test/vagrant/action/box/download_test.rb                      | 2 +-
 test/vagrant/action/box/unpackage_test.rb                     | 2 +-
 test/vagrant/action/box/verify_test.rb                        | 2 +-
 test/vagrant/action/builder_test.rb                           | 2 +-
 test/vagrant/action/env/error_halt_test.rb                    | 2 +-
 test/vagrant/action/env/set_test.rb                           | 2 +-
 test/vagrant/action/environment_test.rb                       | 2 +-
 test/vagrant/action/exception_catcher_test.rb                 | 2 +-
 test/vagrant/action/vm/boot_test.rb                           | 2 +-
 test/vagrant/action/vm/check_guest_additions_test.rb          | 2 +-
 test/vagrant/action/vm/clean_machine_folder_test.rb           | 2 +-
 test/vagrant/action/vm/clear_forwarded_ports_test.rb          | 2 +-
 test/vagrant/action/vm/clear_nfs_exports_test.rb              | 2 +-
 test/vagrant/action/vm/clear_shared_folders_test.rb           | 2 +-
 test/vagrant/action/vm/customize_test.rb                      | 2 +-
 test/vagrant/action/vm/destroy_test.rb                        | 2 +-
 .../action/vm/destroy_unused_network_interfaces_test.rb       | 2 +-
 test/vagrant/action/vm/export_test.rb                         | 2 +-
 test/vagrant/action/vm/forward_ports_helpers_test.rb          | 2 +-
 test/vagrant/action/vm/forward_ports_test.rb                  | 2 +-
 test/vagrant/action/vm/halt_test.rb                           | 2 +-
 test/vagrant/action/vm/import_test.rb                         | 2 +-
 test/vagrant/action/vm/match_mac_address_test.rb              | 2 +-
 test/vagrant/action/vm/network_test.rb                        | 2 +-
 test/vagrant/action/vm/nfs_helpers_test.rb                    | 2 +-
 test/vagrant/action/vm/nfs_test.rb                            | 2 +-
 test/vagrant/action/vm/package_test.rb                        | 2 +-
 test/vagrant/action/vm/persist_test.rb                        | 2 +-
 test/vagrant/action/vm/provision_test.rb                      | 2 +-
 test/vagrant/action/vm/resume_test.rb                         | 2 +-
 test/vagrant/action/vm/share_folders_test.rb                  | 2 +-
 test/vagrant/action/vm/suspend_test.rb                        | 2 +-
 test/vagrant/action_test.rb                                   | 2 +-
 test/vagrant/active_list_test.rb                              | 2 +-
 test/vagrant/box_test.rb                                      | 2 +-
 test/vagrant/command_test.rb                                  | 2 +-
 test/vagrant/commands/base_test.rb                            | 2 +-
 test/vagrant/commands/box/add_test.rb                         | 2 +-
 test/vagrant/commands/box/list_test.rb                        | 2 +-
 test/vagrant/commands/box/remove_test.rb                      | 2 +-
 test/vagrant/commands/destroy_test.rb                         | 2 +-
 test/vagrant/commands/halt_test.rb                            | 2 +-
 test/vagrant/commands/init_test.rb                            | 2 +-
 test/vagrant/commands/package_test.rb                         | 2 +-
 test/vagrant/commands/provision_test.rb                       | 2 +-
 test/vagrant/commands/reload_test.rb                          | 2 +-
 test/vagrant/commands/resume_test.rb                          | 2 +-
 test/vagrant/commands/ssh_config_test.rb                      | 2 +-
 test/vagrant/commands/ssh_test.rb                             | 2 +-
 test/vagrant/commands/status_test.rb                          | 2 +-
 test/vagrant/commands/suspend_test.rb                         | 2 +-
 test/vagrant/commands/up_test.rb                              | 2 +-
 test/vagrant/config_test.rb                                   | 2 +-
 test/vagrant/downloaders/base_test.rb                         | 2 +-
 test/vagrant/downloaders/file_test.rb                         | 2 +-
 test/vagrant/downloaders/http_test.rb                         | 2 +-
 test/vagrant/environment_test.rb                              | 2 +-
 test/vagrant/hosts/base_test.rb                               | 2 +-
 test/vagrant/hosts/bsd_test.rb                                | 2 +-
 test/vagrant/hosts/linux_test.rb                              | 2 +-
 test/vagrant/provisioners/base_test.rb                        | 2 +-
 test/vagrant/provisioners/chef_server_test.rb                 | 2 +-
 test/vagrant/provisioners/chef_solo_test.rb                   | 2 +-
 test/vagrant/provisioners/chef_test.rb                        | 2 +-
 test/vagrant/resource_logger_test.rb                          | 2 +-
 test/vagrant/ssh_session_test.rb                              | 2 +-
 test/vagrant/ssh_test.rb                                      | 2 +-
 test/vagrant/systems/linux_test.rb                            | 2 +-
 test/vagrant/util/busy_test.rb                                | 2 +-
 test/vagrant/util/plain_logger_test.rb                        | 2 +-
 test/vagrant/util/platform_test.rb                            | 2 +-
 test/vagrant/util/stacked_proc_runner_test.rb                 | 2 +-
 test/vagrant/util/template_renderer_test.rb                   | 2 +-
 test/vagrant/util/translator_test.rb                          | 2 +-
 test/vagrant/util_test.rb                                     | 2 +-
 test/vagrant/vm_test.rb                                       | 2 +-
 vagrant.gemspec                                               | 2 +-
 79 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 776b6ba9e..be3c77137 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,11 +3,13 @@ begin
   require 'ruby-debug'
 rescue LoadError; end
 
-
 require File.join(File.dirname(__FILE__), '..', 'lib', 'vagrant')
 require 'contest'
 require 'mocha'
 
+# Add this folder to the load path for "test_helper"
+$:.unshift(File.dirname(__FILE__))
+
 class Test::Unit::TestCase
   # Mocks an environment, setting it up with the given config.
   def mock_environment
diff --git a/test/vagrant/action/box/destroy_test.rb b/test/vagrant/action/box/destroy_test.rb
index 72c44b00d..b8c9e7459 100644
--- a/test/vagrant/action/box/destroy_test.rb
+++ b/test/vagrant/action/box/destroy_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class DestroyBoxActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/box/download_test.rb b/test/vagrant/action/box/download_test.rb
index 552e98b16..f2388567e 100644
--- a/test/vagrant/action/box/download_test.rb
+++ b/test/vagrant/action/box/download_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class DownloadBoxActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/box/unpackage_test.rb b/test/vagrant/action/box/unpackage_test.rb
index 685b67059..d66a76b80 100644
--- a/test/vagrant/action/box/unpackage_test.rb
+++ b/test/vagrant/action/box/unpackage_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class UnpackageBoxActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/box/verify_test.rb b/test/vagrant/action/box/verify_test.rb
index 82fe97083..3dbe608de 100644
--- a/test/vagrant/action/box/verify_test.rb
+++ b/test/vagrant/action/box/verify_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class VerifyBoxActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/builder_test.rb b/test/vagrant/action/builder_test.rb
index 80624ca57..c766fa516 100644
--- a/test/vagrant/action/builder_test.rb
+++ b/test/vagrant/action/builder_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class ActionBuilderTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/env/error_halt_test.rb b/test/vagrant/action/env/error_halt_test.rb
index c34a010e0..b0dbc0fa8 100644
--- a/test/vagrant/action/env/error_halt_test.rb
+++ b/test/vagrant/action/env/error_halt_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ErrorHaltEnvActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/env/set_test.rb b/test/vagrant/action/env/set_test.rb
index 15da49de2..2cae0717f 100644
--- a/test/vagrant/action/env/set_test.rb
+++ b/test/vagrant/action/env/set_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class SetEnvActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/environment_test.rb b/test/vagrant/action/environment_test.rb
index 17ecae6bd..566462606 100644
--- a/test/vagrant/action/environment_test.rb
+++ b/test/vagrant/action/environment_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class ActionEnvironmentTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/exception_catcher_test.rb b/test/vagrant/action/exception_catcher_test.rb
index 4245ce903..6304b1e70 100644
--- a/test/vagrant/action/exception_catcher_test.rb
+++ b/test/vagrant/action/exception_catcher_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class ExceptionCatcherTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/boot_test.rb b/test/vagrant/action/vm/boot_test.rb
index a486fa6df..89e7db184 100644
--- a/test/vagrant/action/vm/boot_test.rb
+++ b/test/vagrant/action/vm/boot_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class BootVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/check_guest_additions_test.rb b/test/vagrant/action/vm/check_guest_additions_test.rb
index 656d3faf2..449cfe00b 100644
--- a/test/vagrant/action/vm/check_guest_additions_test.rb
+++ b/test/vagrant/action/vm/check_guest_additions_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class CheckGuestAdditionsVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/clean_machine_folder_test.rb b/test/vagrant/action/vm/clean_machine_folder_test.rb
index 71d2cf5ab..3bd3f15ca 100644
--- a/test/vagrant/action/vm/clean_machine_folder_test.rb
+++ b/test/vagrant/action/vm/clean_machine_folder_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class CleanMachineFolderVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/clear_forwarded_ports_test.rb b/test/vagrant/action/vm/clear_forwarded_ports_test.rb
index 96328baf8..53b9b5819 100644
--- a/test/vagrant/action/vm/clear_forwarded_ports_test.rb
+++ b/test/vagrant/action/vm/clear_forwarded_ports_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ClearForwardedPortsVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/clear_nfs_exports_test.rb b/test/vagrant/action/vm/clear_nfs_exports_test.rb
index a65fc7523..c789268fb 100644
--- a/test/vagrant/action/vm/clear_nfs_exports_test.rb
+++ b/test/vagrant/action/vm/clear_nfs_exports_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ClearNFSExportsActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/clear_shared_folders_test.rb b/test/vagrant/action/vm/clear_shared_folders_test.rb
index babe83116..468b8cd0b 100644
--- a/test/vagrant/action/vm/clear_shared_folders_test.rb
+++ b/test/vagrant/action/vm/clear_shared_folders_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ClearSharedFoldersVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/customize_test.rb b/test/vagrant/action/vm/customize_test.rb
index d2cefcdaa..328bc77c5 100644
--- a/test/vagrant/action/vm/customize_test.rb
+++ b/test/vagrant/action/vm/customize_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class CustomizeVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/destroy_test.rb b/test/vagrant/action/vm/destroy_test.rb
index 7b71f4327..f97fead0f 100644
--- a/test/vagrant/action/vm/destroy_test.rb
+++ b/test/vagrant/action/vm/destroy_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class DestroyVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb b/test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
index ba38c0b3f..ec314c8ed 100644
--- a/test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
+++ b/test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class DestroyUnusedNetworkInterfacesVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/export_test.rb b/test/vagrant/action/vm/export_test.rb
index 7020b4088..b9c90c4f4 100644
--- a/test/vagrant/action/vm/export_test.rb
+++ b/test/vagrant/action/vm/export_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ExportVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/forward_ports_helpers_test.rb b/test/vagrant/action/vm/forward_ports_helpers_test.rb
index bfa26036a..3f9678835 100644
--- a/test/vagrant/action/vm/forward_ports_helpers_test.rb
+++ b/test/vagrant/action/vm/forward_ports_helpers_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ForwardPortsHelpersVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/forward_ports_test.rb b/test/vagrant/action/vm/forward_ports_test.rb
index ef4f24ac1..481a20e8c 100644
--- a/test/vagrant/action/vm/forward_ports_test.rb
+++ b/test/vagrant/action/vm/forward_ports_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ForwardPortsVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/halt_test.rb b/test/vagrant/action/vm/halt_test.rb
index a1a17d74f..32f3903c1 100644
--- a/test/vagrant/action/vm/halt_test.rb
+++ b/test/vagrant/action/vm/halt_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class HaltVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/import_test.rb b/test/vagrant/action/vm/import_test.rb
index b512f50b7..c3878c7aa 100644
--- a/test/vagrant/action/vm/import_test.rb
+++ b/test/vagrant/action/vm/import_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ImportVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/match_mac_address_test.rb b/test/vagrant/action/vm/match_mac_address_test.rb
index 4bc5c5886..bb44d9615 100644
--- a/test/vagrant/action/vm/match_mac_address_test.rb
+++ b/test/vagrant/action/vm/match_mac_address_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class MatchMACAddressVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/network_test.rb b/test/vagrant/action/vm/network_test.rb
index 9769e078c..038e837e4 100644
--- a/test/vagrant/action/vm/network_test.rb
+++ b/test/vagrant/action/vm/network_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class NetworkVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/nfs_helpers_test.rb b/test/vagrant/action/vm/nfs_helpers_test.rb
index ba7a1a066..173b2403c 100644
--- a/test/vagrant/action/vm/nfs_helpers_test.rb
+++ b/test/vagrant/action/vm/nfs_helpers_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class NFSHelpersVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/nfs_test.rb b/test/vagrant/action/vm/nfs_test.rb
index 83609c939..8ddf6806e 100644
--- a/test/vagrant/action/vm/nfs_test.rb
+++ b/test/vagrant/action/vm/nfs_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class NFSVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/package_test.rb b/test/vagrant/action/vm/package_test.rb
index 7e2a852b4..ea780abb8 100644
--- a/test/vagrant/action/vm/package_test.rb
+++ b/test/vagrant/action/vm/package_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class PackageVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/persist_test.rb b/test/vagrant/action/vm/persist_test.rb
index 555563a37..c8a666c51 100644
--- a/test/vagrant/action/vm/persist_test.rb
+++ b/test/vagrant/action/vm/persist_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class PersistVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/provision_test.rb b/test/vagrant/action/vm/provision_test.rb
index bdc34e2a9..ef5f62500 100644
--- a/test/vagrant/action/vm/provision_test.rb
+++ b/test/vagrant/action/vm/provision_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ProvisionVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/resume_test.rb b/test/vagrant/action/vm/resume_test.rb
index d0fe21f17..b57046310 100644
--- a/test/vagrant/action/vm/resume_test.rb
+++ b/test/vagrant/action/vm/resume_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ResumeVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/share_folders_test.rb b/test/vagrant/action/vm/share_folders_test.rb
index e0aaf45a4..d2deed301 100644
--- a/test/vagrant/action/vm/share_folders_test.rb
+++ b/test/vagrant/action/vm/share_folders_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class ShareFoldersVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action/vm/suspend_test.rb b/test/vagrant/action/vm/suspend_test.rb
index 0084b9db9..bd4f7f5d3 100644
--- a/test/vagrant/action/vm/suspend_test.rb
+++ b/test/vagrant/action/vm/suspend_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class SuspendVMActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/action_test.rb b/test/vagrant/action_test.rb
index 509dfa904..5e8b839bf 100644
--- a/test/vagrant/action_test.rb
+++ b/test/vagrant/action_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class ActionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/active_list_test.rb b/test/vagrant/active_list_test.rb
index da579d765..b6cfd7d03 100644
--- a/test/vagrant/active_list_test.rb
+++ b/test/vagrant/active_list_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class ActiveListTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/box_test.rb b/test/vagrant/box_test.rb
index 2a1533528..8117e4f14 100644
--- a/test/vagrant/box_test.rb
+++ b/test/vagrant/box_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class BoxTest < Test::Unit::TestCase
   context "class methods" do
diff --git a/test/vagrant/command_test.rb b/test/vagrant/command_test.rb
index 9e142ea44..cd8e294ca 100644
--- a/test/vagrant/command_test.rb
+++ b/test/vagrant/command_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class CommandTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/base_test.rb b/test/vagrant/commands/base_test.rb
index 0aac0e55e..ae7d3a8af 100644
--- a/test/vagrant/commands/base_test.rb
+++ b/test/vagrant/commands/base_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsBaseTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/box/add_test.rb b/test/vagrant/commands/box/add_test.rb
index 6aa25b272..592e84bb8 100644
--- a/test/vagrant/commands/box/add_test.rb
+++ b/test/vagrant/commands/box/add_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsBoxAddTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/box/list_test.rb b/test/vagrant/commands/box/list_test.rb
index b0a28542d..4b90d5833 100644
--- a/test/vagrant/commands/box/list_test.rb
+++ b/test/vagrant/commands/box/list_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsBoxListTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/box/remove_test.rb b/test/vagrant/commands/box/remove_test.rb
index 97e7dfb80..5a66e7b15 100644
--- a/test/vagrant/commands/box/remove_test.rb
+++ b/test/vagrant/commands/box/remove_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsBoxRemoveTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/destroy_test.rb b/test/vagrant/commands/destroy_test.rb
index 94eb895e3..c3b9b8f18 100644
--- a/test/vagrant/commands/destroy_test.rb
+++ b/test/vagrant/commands/destroy_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsDestroyTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/halt_test.rb b/test/vagrant/commands/halt_test.rb
index 46f8db7dd..35d87a7aa 100644
--- a/test/vagrant/commands/halt_test.rb
+++ b/test/vagrant/commands/halt_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsHaltTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/init_test.rb b/test/vagrant/commands/init_test.rb
index 13a7f4cb0..1772fb2e2 100644
--- a/test/vagrant/commands/init_test.rb
+++ b/test/vagrant/commands/init_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsInitTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/package_test.rb b/test/vagrant/commands/package_test.rb
index 2b8cd2413..a7586e248 100644
--- a/test/vagrant/commands/package_test.rb
+++ b/test/vagrant/commands/package_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsPackageTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/provision_test.rb b/test/vagrant/commands/provision_test.rb
index 0127d6bcc..74c6ad61d 100644
--- a/test/vagrant/commands/provision_test.rb
+++ b/test/vagrant/commands/provision_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsProvisionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/reload_test.rb b/test/vagrant/commands/reload_test.rb
index 981859068..0ab3462af 100644
--- a/test/vagrant/commands/reload_test.rb
+++ b/test/vagrant/commands/reload_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsReloadTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/resume_test.rb b/test/vagrant/commands/resume_test.rb
index 7da402f05..cb47502f0 100644
--- a/test/vagrant/commands/resume_test.rb
+++ b/test/vagrant/commands/resume_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsResumeTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/ssh_config_test.rb b/test/vagrant/commands/ssh_config_test.rb
index 3fab1dd4a..3a3d6c6f6 100644
--- a/test/vagrant/commands/ssh_config_test.rb
+++ b/test/vagrant/commands/ssh_config_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsSSHConfigTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/ssh_test.rb b/test/vagrant/commands/ssh_test.rb
index 42ca62166..4a621ce14 100644
--- a/test/vagrant/commands/ssh_test.rb
+++ b/test/vagrant/commands/ssh_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsSSHTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/status_test.rb b/test/vagrant/commands/status_test.rb
index f79f66d27..9049b4908 100644
--- a/test/vagrant/commands/status_test.rb
+++ b/test/vagrant/commands/status_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsStatusTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/suspend_test.rb b/test/vagrant/commands/suspend_test.rb
index bc9b437d1..841defd78 100644
--- a/test/vagrant/commands/suspend_test.rb
+++ b/test/vagrant/commands/suspend_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsSuspendTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/commands/up_test.rb b/test/vagrant/commands/up_test.rb
index 477c61d5c..92bef382f 100644
--- a/test/vagrant/commands/up_test.rb
+++ b/test/vagrant/commands/up_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class CommandsUpTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/config_test.rb b/test/vagrant/config_test.rb
index 87dd88475..63ef22f46 100644
--- a/test/vagrant/config_test.rb
+++ b/test/vagrant/config_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class ConfigTest < Test::Unit::TestCase
   context "the ssh config" do
diff --git a/test/vagrant/downloaders/base_test.rb b/test/vagrant/downloaders/base_test.rb
index 78006cc2f..7b7d679fe 100644
--- a/test/vagrant/downloaders/base_test.rb
+++ b/test/vagrant/downloaders/base_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class BaseDownloaderTest < Test::Unit::TestCase
   should "include the util class so subclasses have access to it" do
diff --git a/test/vagrant/downloaders/file_test.rb b/test/vagrant/downloaders/file_test.rb
index 2977aa44b..3512b9818 100644
--- a/test/vagrant/downloaders/file_test.rb
+++ b/test/vagrant/downloaders/file_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class FileDownloaderTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/downloaders/http_test.rb b/test/vagrant/downloaders/http_test.rb
index 8fb858196..d48cc4557 100644
--- a/test/vagrant/downloaders/http_test.rb
+++ b/test/vagrant/downloaders/http_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class HttpDownloaderTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/environment_test.rb b/test/vagrant/environment_test.rb
index 78f2cc0af..3d17276d9 100644
--- a/test/vagrant/environment_test.rb
+++ b/test/vagrant/environment_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class EnvironmentTest < Test::Unit::TestCase
   context "class method check virtualbox version" do
diff --git a/test/vagrant/hosts/base_test.rb b/test/vagrant/hosts/base_test.rb
index 271dfc115..93ddd66c0 100644
--- a/test/vagrant/hosts/base_test.rb
+++ b/test/vagrant/hosts/base_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class BaseHostTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/hosts/bsd_test.rb b/test/vagrant/hosts/bsd_test.rb
index 4cb087997..db86daab3 100644
--- a/test/vagrant/hosts/bsd_test.rb
+++ b/test/vagrant/hosts/bsd_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class BSDHostTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/hosts/linux_test.rb b/test/vagrant/hosts/linux_test.rb
index 2f089dee7..b2c4d208f 100644
--- a/test/vagrant/hosts/linux_test.rb
+++ b/test/vagrant/hosts/linux_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class LinuxHostTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/provisioners/base_test.rb b/test/vagrant/provisioners/base_test.rb
index ec3947f63..36ef54e6c 100644
--- a/test/vagrant/provisioners/base_test.rb
+++ b/test/vagrant/provisioners/base_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class BaseProvisionerTest < Test::Unit::TestCase
   should "include the util class so subclasses have access to it" do
diff --git a/test/vagrant/provisioners/chef_server_test.rb b/test/vagrant/provisioners/chef_server_test.rb
index 4bd4e1668..4957bf0e5 100644
--- a/test/vagrant/provisioners/chef_server_test.rb
+++ b/test/vagrant/provisioners/chef_server_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class ChefServerProvisionerTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/provisioners/chef_solo_test.rb b/test/vagrant/provisioners/chef_solo_test.rb
index a4d0452fb..35c000ede 100644
--- a/test/vagrant/provisioners/chef_solo_test.rb
+++ b/test/vagrant/provisioners/chef_solo_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class ChefSoloProvisionerTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/provisioners/chef_test.rb b/test/vagrant/provisioners/chef_test.rb
index 32df5d159..f0786a8e0 100644
--- a/test/vagrant/provisioners/chef_test.rb
+++ b/test/vagrant/provisioners/chef_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class ChefProvisionerTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/resource_logger_test.rb b/test/vagrant/resource_logger_test.rb
index be7845152..66139cf09 100644
--- a/test/vagrant/resource_logger_test.rb
+++ b/test/vagrant/resource_logger_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class ResourceLoggerTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/ssh_session_test.rb b/test/vagrant/ssh_session_test.rb
index 3ca470653..f87e05340 100644
--- a/test/vagrant/ssh_session_test.rb
+++ b/test/vagrant/ssh_session_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class SshSessionTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/ssh_test.rb b/test/vagrant/ssh_test.rb
index 8c4ffadd6..48d4cfbbf 100644
--- a/test/vagrant/ssh_test.rb
+++ b/test/vagrant/ssh_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class SshTest < Test::Unit::TestCase
   def mock_ssh
diff --git a/test/vagrant/systems/linux_test.rb b/test/vagrant/systems/linux_test.rb
index 9a86815ee..186229e65 100644
--- a/test/vagrant/systems/linux_test.rb
+++ b/test/vagrant/systems/linux_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class LinuxSystemTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/util/busy_test.rb b/test/vagrant/util/busy_test.rb
index 2279b6750..0490f683d 100644
--- a/test/vagrant/util/busy_test.rb
+++ b/test/vagrant/util/busy_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class BusyUtilTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/util/plain_logger_test.rb b/test/vagrant/util/plain_logger_test.rb
index 6c5cf61a2..7a3929c35 100644
--- a/test/vagrant/util/plain_logger_test.rb
+++ b/test/vagrant/util/plain_logger_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class PlainLoggerUtilTest < Test::Unit::TestCase
   setup do
diff --git a/test/vagrant/util/platform_test.rb b/test/vagrant/util/platform_test.rb
index 0a2d39f3d..ab6789c97 100644
--- a/test/vagrant/util/platform_test.rb
+++ b/test/vagrant/util/platform_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class PlatformTest < Test::Unit::TestCase
   context "file options" do
diff --git a/test/vagrant/util/stacked_proc_runner_test.rb b/test/vagrant/util/stacked_proc_runner_test.rb
index 687d311c8..69fb8327f 100644
--- a/test/vagrant/util/stacked_proc_runner_test.rb
+++ b/test/vagrant/util/stacked_proc_runner_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class StackedProcRunnerUtilTest < Test::Unit::TestCase
   class TestClass
diff --git a/test/vagrant/util/template_renderer_test.rb b/test/vagrant/util/template_renderer_test.rb
index 5c2812556..dbca3a339 100644
--- a/test/vagrant/util/template_renderer_test.rb
+++ b/test/vagrant/util/template_renderer_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class TemplateRendererUtilTest < Test::Unit::TestCase
   context "initializing" do
diff --git a/test/vagrant/util/translator_test.rb b/test/vagrant/util/translator_test.rb
index b84af69b7..94bfd6056 100644
--- a/test/vagrant/util/translator_test.rb
+++ b/test/vagrant/util/translator_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require "test_helper"
 
 class TranslatorUtilTest < Test::Unit::TestCase
   include Vagrant::Util
diff --git a/test/vagrant/util_test.rb b/test/vagrant/util_test.rb
index f9ebe1ece..7e8ee707e 100644
--- a/test/vagrant/util_test.rb
+++ b/test/vagrant/util_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class UtilTest < Test::Unit::TestCase
   class UtilIncludeTest
diff --git a/test/vagrant/vm_test.rb b/test/vagrant/vm_test.rb
index e9a4ce269..8d62c40b8 100644
--- a/test/vagrant/vm_test.rb
+++ b/test/vagrant/vm_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require "test_helper"
 
 class VMTest < Test::Unit::TestCase
   setup do
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 4076a0738..2f7e8bbfe 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-07-18}
+  s.date = %q{2010-07-19}
   s.default_executable = %q{vagrant}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]