From 90dbb8a1413c2a5e1cee0dd1ab05029d657d04af Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Tue, 19 Jun 2012 22:50:15 -0500
Subject: [PATCH] Prune some requires from test files

testing_env already requires utils; set up the ARGV and ENV extensions
there as well.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Homebrew/test/test_ARGV.rb             | 4 ----
 Library/Homebrew/test/test_ENV.rb              | 5 -----
 Library/Homebrew/test/test_bucket.rb           | 5 -----
 Library/Homebrew/test/test_checksums.rb        | 6 ------
 Library/Homebrew/test/test_cleaner.rb          | 4 ----
 Library/Homebrew/test/test_compilers.rb        | 7 -------
 Library/Homebrew/test/test_external_deps.rb    | 5 -----
 Library/Homebrew/test/test_formula.rb          | 7 -------
 Library/Homebrew/test/test_formula_install.rb  | 5 -----
 Library/Homebrew/test/test_hardware.rb         | 5 -----
 Library/Homebrew/test/test_inreplace.rb        | 1 -
 Library/Homebrew/test/test_mach.rb             | 3 ---
 Library/Homebrew/test/test_patches.rb          | 5 -----
 Library/Homebrew/test/test_patching.rb         | 5 -----
 Library/Homebrew/test/test_pathname_install.rb | 4 ----
 Library/Homebrew/test/test_string.rb           | 2 --
 Library/Homebrew/test/test_updater.rb          | 5 -----
 Library/Homebrew/test/test_utils.rb            | 6 ------
 Library/Homebrew/test/test_versions.rb         | 4 ----
 Library/Homebrew/test/testing_env.rb           | 6 ++++++
 20 files changed, 6 insertions(+), 88 deletions(-)

diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test_ARGV.rb
index c28bf9c67e..1e65fe143b 100644
--- a/Library/Homebrew/test/test_ARGV.rb
+++ b/Library/Homebrew/test/test_ARGV.rb
@@ -1,9 +1,5 @@
 require 'testing_env'
 
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
-
 module ExtendArgvPlusYeast
   def reset
     @named = nil
diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index 8ab1c1f249..210b5d4c52 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test_ENV.rb
@@ -1,10 +1,5 @@
 require 'testing_env'
-require 'utils'
 require 'hardware'
-require 'extend/ENV'
-require 'extend/ARGV'
-ENV.extend(HomebrewEnvExtension)
-ARGV.extend(HomebrewArgvExtension)
   
 class EnvironmentTests < Test::Unit::TestCase
   def test_ENV_options
diff --git a/Library/Homebrew/test/test_bucket.rb b/Library/Homebrew/test/test_bucket.rb
index cd8f3905f3..cdbe9bd817 100644
--- a/Library/Homebrew/test/test_bucket.rb
+++ b/Library/Homebrew/test/test_bucket.rb
@@ -1,10 +1,5 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'test/testball'
-require 'utils'
 
 class MockFormula <Formula
   def initialize url
diff --git a/Library/Homebrew/test/test_checksums.rb b/Library/Homebrew/test/test_checksums.rb
index c1e20ef282..5691b5b2b9 100644
--- a/Library/Homebrew/test/test_checksums.rb
+++ b/Library/Homebrew/test/test_checksums.rb
@@ -1,11 +1,5 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'test/testball'
-require 'utils'
-
 
 class ChecksumTests < Test::Unit::TestCase
   def good_checksum f
diff --git a/Library/Homebrew/test/test_cleaner.rb b/Library/Homebrew/test/test_cleaner.rb
index e9e9c96ef6..81c2e27d43 100644
--- a/Library/Homebrew/test/test_cleaner.rb
+++ b/Library/Homebrew/test/test_cleaner.rb
@@ -1,8 +1,4 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'cleaner'
 
 class CleanerTestBall < Formula
diff --git a/Library/Homebrew/test/test_compilers.rb b/Library/Homebrew/test/test_compilers.rb
index bf9bc557ad..19eb694349 100644
--- a/Library/Homebrew/test/test_compilers.rb
+++ b/Library/Homebrew/test/test_compilers.rb
@@ -1,11 +1,4 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
-require 'extend/ENV'
-ENV.extend(HomebrewEnvExtension)
-
 require 'test/testball'
 
 class CompilerTests < Test::Unit::TestCase
diff --git a/Library/Homebrew/test/test_external_deps.rb b/Library/Homebrew/test/test_external_deps.rb
index 2d955dc26d..f36eac9b07 100644
--- a/Library/Homebrew/test/test_external_deps.rb
+++ b/Library/Homebrew/test/test_external_deps.rb
@@ -1,12 +1,7 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'extend/string'
 require 'test/testball'
 require 'formula_installer'
-require 'utils'
 
 
 class ExternalDepsTests < Test::Unit::TestCase
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 8f4e5149b8..83b77fd4dc 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -1,11 +1,4 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
-require 'extend/ENV'
-ENV.extend(HomebrewEnvExtension)
-
 require 'test/testball'
 
 class AbstractDownloadStrategy
diff --git a/Library/Homebrew/test/test_formula_install.rb b/Library/Homebrew/test/test_formula_install.rb
index 14b8730945..2c2a5e6750 100644
--- a/Library/Homebrew/test/test_formula_install.rb
+++ b/Library/Homebrew/test/test_formula_install.rb
@@ -1,12 +1,7 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'formula'
 require 'test/testball'
 require 'keg'
-require 'utils'
 
 
 class TestScriptFileFormula <ScriptFileFormula
diff --git a/Library/Homebrew/test/test_hardware.rb b/Library/Homebrew/test/test_hardware.rb
index e7e047eaa9..bdc20d39aa 100644
--- a/Library/Homebrew/test/test_hardware.rb
+++ b/Library/Homebrew/test/test_hardware.rb
@@ -1,11 +1,6 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'hardware'
 
-
 class HardwareTests < Test::Unit::TestCase
   # these will raise if we don't recognise your mac, but that prolly 
   # indicates something went wrong rather than we don't know
diff --git a/Library/Homebrew/test/test_inreplace.rb b/Library/Homebrew/test/test_inreplace.rb
index a128b63c99..11e09274d8 100644
--- a/Library/Homebrew/test/test_inreplace.rb
+++ b/Library/Homebrew/test/test_inreplace.rb
@@ -1,5 +1,4 @@
 require 'testing_env'
-require 'utils'
 require 'extend/string'
 
 class InreplaceTest < Test::Unit::TestCase
diff --git a/Library/Homebrew/test/test_mach.rb b/Library/Homebrew/test/test_mach.rb
index b9acd337fd..c2ba0083cc 100644
--- a/Library/Homebrew/test/test_mach.rb
+++ b/Library/Homebrew/test/test_mach.rb
@@ -1,8 +1,5 @@
 require 'testing_env'
 
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 def file pn
   `/usr/bin/file -h '#{pn}'`.chomp
 end
diff --git a/Library/Homebrew/test/test_patches.rb b/Library/Homebrew/test/test_patches.rb
index 4d36bd1fe4..e3a8203ce1 100644
--- a/Library/Homebrew/test/test_patches.rb
+++ b/Library/Homebrew/test/test_patches.rb
@@ -1,10 +1,5 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'test/testball'
-require 'utils'
 require 'set'
 
 # Expose some internals
diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test_patching.rb
index bd51c1a152..248530a491 100644
--- a/Library/Homebrew/test/test_patching.rb
+++ b/Library/Homebrew/test/test_patching.rb
@@ -1,10 +1,5 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'test/testball'
-require 'utils'
 
 
 class DefaultPatchBall <TestBall
diff --git a/Library/Homebrew/test/test_pathname_install.rb b/Library/Homebrew/test/test_pathname_install.rb
index 3497376811..bdd90ec4c9 100644
--- a/Library/Homebrew/test/test_pathname_install.rb
+++ b/Library/Homebrew/test/test_pathname_install.rb
@@ -1,9 +1,5 @@
 require 'testing_env'
 
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
-
 TEMP_FOLDER = HOMEBREW_PREFIX+"temp_dir"
 TARGET_FOLDER = TEMP_FOLDER+'folder1'
 
diff --git a/Library/Homebrew/test/test_string.rb b/Library/Homebrew/test/test_string.rb
index 55a70f72c4..2acc21ddbb 100644
--- a/Library/Homebrew/test/test_string.rb
+++ b/Library/Homebrew/test/test_string.rb
@@ -1,6 +1,4 @@
 require 'testing_env'
-require 'utils'
-
 require 'extend/string'
 
 class StringTest <Test::Unit::TestCase
diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb
index b47c0c052a..847d60e281 100644
--- a/Library/Homebrew/test/test_updater.rb
+++ b/Library/Homebrew/test/test_updater.rb
@@ -1,12 +1,7 @@
 abort if ARGV.include? "--skip-update"
 
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'formula'
-require 'utils'
 require 'cmd/update'
 
 class UpdaterMock < Updater
diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test_utils.rb
index bc8a54b629..f099bbc9f3 100644
--- a/Library/Homebrew/test/test_utils.rb
+++ b/Library/Homebrew/test/test_utils.rb
@@ -1,11 +1,5 @@
 require 'testing_env'
 
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
-require 'utils'
-
-
 class UtilTests < Test::Unit::TestCase
 
   def test_put_columns_empty
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index 4c9b700458..b7e90a0355 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -1,8 +1,4 @@
 require 'testing_env'
-
-require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
-ARGV.extend(HomebrewArgvExtension)
-
 require 'formula'
 require 'test/testball'
 
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 68df4e17e5..40e715632d 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -58,3 +58,9 @@ unless ARGV.include? "--no-compat" or ENV['HOMEBREW_NO_COMPAT']
 end
 
 require 'test/unit' # must be after at_exit
+
+require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
+ARGV.extend(HomebrewArgvExtension)
+
+require 'extend/ENV'
+ENV.extend(HomebrewEnvExtension)