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

@@ -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

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

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

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

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

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

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

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

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

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

Library/Homebrew/test/test_inreplace.rb

@@ -1,5 +1,4 @@
 require 'testing_env'
-require 'utils'
 require 'extend/string'
 
 class InreplaceTest < Test::Unit::TestCase

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

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

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

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'
 

Library/Homebrew/test/test_string.rb

@@ -1,6 +1,4 @@
 require 'testing_env'
-require 'utils'
-
 require 'extend/string'
 
 class StringTest <Test::Unit::TestCase

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

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

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'
 

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)