tests: reset ARGV in teardown

Library/Homebrew/test/cleanup_test.rb

@@ -21,8 +21,6 @@ class CleanupTests < Homebrew::TestCase
 
   def teardown
     FileUtils.rm_f @ds_store
-    ARGV.delete "--dry-run"
-    ARGV.delete "--prune=all"
     super
   end
 

Library/Homebrew/test/formula_installer_test.rb

@@ -61,8 +61,6 @@ class InstallTests < Homebrew::TestCase
       assert_equal 3, bin.children.length
       assert_predicate f.prefix/".brew/testball.rb", :readable?
     end
-  ensure
-    ARGV.reject! { |a| a == "--with-invalid_flag" }
   end
 
   def test_bottle_unneeded_formula_install
@@ -86,13 +84,10 @@ class InstallTests < Homebrew::TestCase
 
     cc_arg = "--cc=clang"
     ARGV << cc_arg
-    begin
+
-      temporary_install(TestballBottle.new) do |f|
+    temporary_install(TestballBottle.new) do |f|
-        tab = Tab.for_formula(f)
+      tab = Tab.for_formula(f)
-        assert_equal "clang", tab.compiler
+      assert_equal "clang", tab.compiler
-      end
-    ensure
-      ARGV.delete_if { |x| x == cc_arg }
     end
   end
 end

Library/Homebrew/test/support/helper/test_case.rb

@@ -14,8 +14,14 @@ module Homebrew
     TEST_SHA1   = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
     TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
 
+    def setup
+      super
+      @__argv = ARGV.dup
+    end
+
     def teardown
       Tab.clear_cache
+      ARGV.replace(@__argv)
       super
     end
 

Library/Homebrew/test/uninstall_test.rb

@@ -62,8 +62,6 @@ class UninstallTests < Homebrew::TestCase
       assert_empty handle_unsatisfied_dependents
       refute_predicate Homebrew, :failed?
     end
-  ensure
-    ARGV.delete("--ignore-dependencies")
   end
 end