Refactor `shutup`.

2 files changed, 27 insertions, 16 deletions

diff --git a/Library/Homebrew/test/helper/shutup.rb b/Library/Homebrew/test/helper/shutup.rb
new file mode 100644
index 000000000..fa5f08d31
--- /dev/null
+++ b/Library/Homebrew/test/helper/shutup.rb
@@ -0,0 +1,24 @@
+module Test
+  module Helper
+    module Shutup
+      def shutup
+        if ENV.key?("VERBOSE_TESTS")
+          yield
+        else
+          begin
+            tmperr = $stderr.clone
+            tmpout = $stdout.clone
+            $stderr.reopen("/dev/null")
+            $stdout.reopen("/dev/null")
+            yield
+          ensure
+            $stderr.reopen(tmperr)
+            $stdout.reopen(tmpout)
+            tmperr.close
+            tmpout.close
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index e5ce1851e..5d464b8cc 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -63,6 +63,9 @@ module Homebrew
   end
 
   class TestCase < ::Minitest::Test
+    require "test/helper/shutup"
+    include Test::Helper::Shutup
+
     include VersionAssertions
     include FSLeakLogger
 
@@ -73,22 +76,6 @@ module Homebrew
       @_f = Class.new(Formula, &block).new(name, path, spec)
     end
 
-    def shutup
-      err = $stderr.dup
-      out = $stdout.dup
-
-      begin
-        $stderr.reopen("/dev/null")
-        $stdout.reopen("/dev/null")
-        yield
-      ensure
-        $stderr.reopen(err)
-        $stdout.reopen(out)
-        err.close
-        out.close
-      end
-    end
-
     def mktmpdir(prefix_suffix = nil, &block)
       Dir.mktmpdir(prefix_suffix, HOMEBREW_TEMP, &block)
     end