Fix tests so they run on Ruby 1.9.2

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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"]