From 15462cc8178aa555334d2b67a7e3b6656bd7bf70 Mon Sep 17 00:00:00 2001
From: Bruce Steedman <bruce.steedman@gmail.com>
Date: Sat, 1 Oct 2016 09:49:06 +0100
Subject: [PATCH] delete verbose env vars in `brew tests`

---
 Library/Homebrew/dev-cmd/tests.rb                 |  2 ++
 Library/Homebrew/test/test_download_strategies.rb | 12 ++----------
 Library/Homebrew/test/test_outdated.rb            |  6 +-----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 9b15f9f3ef..4e2d3b2db8 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -7,6 +7,8 @@ require "tap"
 module Homebrew
   def tests
     (HOMEBREW_LIBRARY/"Homebrew").cd do
+      ENV.delete "HOMEBREW_VERBOSE"
+      ENV.delete "VERBOSE"
       ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
       ENV["HOMEBREW_DEVELOPER"] = "1"
       ENV["TESTOPTS"] = "-v" if ARGV.verbose?
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index e349401855..87218fb12b 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -23,20 +23,12 @@ class AbstractDownloadStrategyTests < Homebrew::TestCase
   def test_expand_safe_system_args_with_explicit_quiet_flag
     @args << { quiet_flag: "--flag" }
     expanded_args = @strategy.expand_safe_system_args(@args)
-    if ARGV.verbose?
-      assert_equal %w[foo bar baz], expanded_args
-    else
-      assert_equal %w[foo bar baz --flag], expanded_args
-    end
+    assert_equal %w[foo bar baz --flag], expanded_args
   end
 
   def test_expand_safe_system_args_with_implicit_quiet_flag
     expanded_args = @strategy.expand_safe_system_args(@args)
-    if ARGV.verbose?
-      assert_equal %w[foo bar baz], expanded_args
-    else
-      assert_equal %w[foo bar -q baz], expanded_args
-    end
+    assert_equal %w[foo bar -q baz], expanded_args
   end
 
   def test_expand_safe_system_args_does_not_mutate_argument
diff --git a/Library/Homebrew/test/test_outdated.rb b/Library/Homebrew/test/test_outdated.rb
index 8ee3844df4..cc0f024c8d 100644
--- a/Library/Homebrew/test/test_outdated.rb
+++ b/Library/Homebrew/test/test_outdated.rb
@@ -5,10 +5,6 @@ class IntegrationCommandTestOutdated < IntegrationCommandTestCase
     setup_test_formula "testball"
     (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath
 
-    if ARGV.verbose?
-      assert_equal "testball (0.0.1) < 0.1", cmd("outdated")
-    else
-      assert_equal "testball", cmd("outdated")
-    end
+    assert_equal "testball", cmd("outdated")
   end
 end