3 files changed, 22 insertions, 15 deletions
diff --git a/Library/Homebrew/test/test_formula_install.rb b/Library/Homebrew/test/test_formula_install.rb
index 7a69a50af..14b873094 100644
--- a/Library/Homebrew/test/test_formula_install.rb
+++ b/Library/Homebrew/test/test_formula_install.rb
@@ -23,22 +23,12 @@ end
 
 class ConfigureTests < Test::Unit::TestCase
   def test_detect_failed_configure
-    tmperr = $stderr
-    tmpout = $stdout
-    require 'stringio'
-    $stderr = StringIO.new
-    $stdout = StringIO.new
-
     f = ConfigureFails.new
-
     begin
-      f.brew { f.install }
+      shutup { f.brew { f.install } }
     rescue BuildError => e
       assert e.was_running_configure?
     end
-
-    $stderr = tmperr
-    $stdout = tmpout
   end
 end
 
diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test_patching.rb
index ea8d159a6..bd51c1a15 100644
--- a/Library/Homebrew/test/test_patching.rb
+++ b/Library/Homebrew/test/test_patching.rb
@@ -39,7 +39,7 @@ class PatchingTests < Test::Unit::TestCase
   end
   
   def test_single_patch
-    nostdout do
+    shutup do
       DefaultPatchBall.new('test_patch').brew do
         s = read_file 'libexec/NOOP'
         assert !s.include?("NOOP"), "File was unpatched."
@@ -49,7 +49,7 @@ class PatchingTests < Test::Unit::TestCase
   end
 
   def test_patch_list
-    nostdout do
+    shutup do
       ListPatchBall.new('test_patch_list').brew do
         s = read_file 'libexec/NOOP'
         assert !s.include?("NOOP"), "File was unpatched."
@@ -59,7 +59,7 @@ class PatchingTests < Test::Unit::TestCase
   end
 
   def test_p0_patch
-    nostdout do
+    shutup do
       P0PatchBall.new('test_p0_patch').brew do
         s = read_file 'libexec/NOOP'
         assert !s.include?("NOOP"), "File was unpatched."
@@ -69,7 +69,7 @@ class PatchingTests < Test::Unit::TestCase
   end
 
   def test_p1_patch
-    nostdout do
+    shutup do
       P1PatchBall.new('test_p1_patch').brew do
         s = read_file 'libexec/NOOP'
         assert !s.include?("NOOP"), "File was unpatched."
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 1e183287a..a283dbf25 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -35,4 +35,21 @@ module Homebrew extend self
   include FileUtils
 end
 
+def shutup
+  if ARGV.verbose?
+    yield
+  else
+    begin
+      tmperr = $stderr.clone
+      tmpout = $stdout.clone
+      $stderr.reopen '/dev/null', 'w'
+      $stdout.reopen '/dev/null', 'w'
+      yield
+    ensure
+      $stderr.reopen tmperr
+      $stdout.reopen tmpout
+    end
+  end
+end
+
 require 'test/unit' # must be after at_exit