Move test files back directly to `test/`.

132 files changed, 3 insertions, 3 deletions

diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 656225516..c032b3437 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -44,8 +44,8 @@ module Homebrew
       # Make it easier to reproduce test runs.
       ENV["SEED"] = ARGV.next if ARGV.include? "--seed"
 
-      files = Dir.glob("test/test/**/*_test.rb")
-                 .reject { |p| !OS.mac? && p.start_with?("test/test/os/mac/") }
+      files = Dir.glob("test/**/*_test.rb")
+                 .reject { |p| !OS.mac? && p.start_with?("test/os/mac/") }
 
       opts = []
       opts << "--serialize-stdout" if ENV["CI"]
@@ -55,7 +55,7 @@ module Homebrew
 
       if ARGV.value("only")
         test_name, test_method = ARGV.value("only").split(":", 2)
-        files = Dir.glob("test/test/{#{test_name},#{test_name}/**/*}_test.rb")
+        files = Dir.glob("test/{#{test_name},#{test_name}/**/*}_test.rb")
         args << "--name=test_#{test_method}" if test_method
       end
 
diff --git a/Library/Homebrew/test/test/ARGV_test.rb b/Library/Homebrew/test/ARGV_test.rb
index 6805e0c62..6805e0c62 100644
--- a/Library/Homebrew/test/test/ARGV_test.rb
+++ b/Library/Homebrew/test/ARGV_test.rb
diff --git a/Library/Homebrew/test/test/ENV_test.rb b/Library/Homebrew/test/ENV_test.rb
index 6c0e68a9e..6c0e68a9e 100644
--- a/Library/Homebrew/test/test/ENV_test.rb
+++ b/Library/Homebrew/test/ENV_test.rb
diff --git a/Library/Homebrew/test/test/analytics_test.rb b/Library/Homebrew/test/analytics_test.rb
index 37040f3cd..37040f3cd 100644
--- a/Library/Homebrew/test/test/analytics_test.rb
+++ b/Library/Homebrew/test/analytics_test.rb
diff --git a/Library/Homebrew/test/test/audit_test.rb b/Library/Homebrew/test/audit_test.rb
index 2725f906e..2725f906e 100644
--- a/Library/Homebrew/test/test/audit_test.rb
+++ b/Library/Homebrew/test/audit_test.rb
diff --git a/Library/Homebrew/test/test/bash_test.rb b/Library/Homebrew/test/bash_test.rb
index ff418c787..ff418c787 100644
--- a/Library/Homebrew/test/test/bash_test.rb
+++ b/Library/Homebrew/test/bash_test.rb
diff --git a/Library/Homebrew/test/test/blacklist_test.rb b/Library/Homebrew/test/blacklist_test.rb
index 585a35484..585a35484 100644
--- a/Library/Homebrew/test/test/blacklist_test.rb
+++ b/Library/Homebrew/test/blacklist_test.rb
diff --git a/Library/Homebrew/test/test/bottle_collector_test.rb b/Library/Homebrew/test/bottle_collector_test.rb
index d75e29ec8..d75e29ec8 100644
--- a/Library/Homebrew/test/test/bottle_collector_test.rb
+++ b/Library/Homebrew/test/bottle_collector_test.rb
diff --git a/Library/Homebrew/test/test/bottle_filename_test.rb b/Library/Homebrew/test/bottle_filename_test.rb
index 6604e7d6a..6604e7d6a 100644
--- a/Library/Homebrew/test/test/bottle_filename_test.rb
+++ b/Library/Homebrew/test/bottle_filename_test.rb
diff --git a/Library/Homebrew/test/test/bottle_hooks_test.rb b/Library/Homebrew/test/bottle_hooks_test.rb
index 3535d80ef..3535d80ef 100644
--- a/Library/Homebrew/test/test/bottle_hooks_test.rb
+++ b/Library/Homebrew/test/bottle_hooks_test.rb
diff --git a/Library/Homebrew/test/test/bottle_test.rb b/Library/Homebrew/test/bottle_test.rb
index c10746e09..c10746e09 100644
--- a/Library/Homebrew/test/test/bottle_test.rb
+++ b/Library/Homebrew/test/bottle_test.rb
diff --git a/Library/Homebrew/test/test/build_environment_test.rb b/Library/Homebrew/test/build_environment_test.rb
index 73a1c95f7..73a1c95f7 100644
--- a/Library/Homebrew/test/test/build_environment_test.rb
+++ b/Library/Homebrew/test/build_environment_test.rb
diff --git a/Library/Homebrew/test/test/build_options_test.rb b/Library/Homebrew/test/build_options_test.rb
index e460d25cc..e460d25cc 100644
--- a/Library/Homebrew/test/test/build_options_test.rb
+++ b/Library/Homebrew/test/build_options_test.rb
diff --git a/Library/Homebrew/test/test/bundle_test.rb b/Library/Homebrew/test/bundle_test.rb
index ae47977d8..ae47977d8 100644
--- a/Library/Homebrew/test/test/bundle_test.rb
+++ b/Library/Homebrew/test/bundle_test.rb
diff --git a/Library/Homebrew/test/test/cache_formula_test.rb b/Library/Homebrew/test/cache_formula_test.rb
index 6dcb6a745..6dcb6a745 100644
--- a/Library/Homebrew/test/test/cache_formula_test.rb
+++ b/Library/Homebrew/test/cache_formula_test.rb
diff --git a/Library/Homebrew/test/test/cache_test.rb b/Library/Homebrew/test/cache_test.rb
index 3a9e6b011..3a9e6b011 100644
--- a/Library/Homebrew/test/test/cache_test.rb
+++ b/Library/Homebrew/test/cache_test.rb
diff --git a/Library/Homebrew/test/test/cask_test.rb b/Library/Homebrew/test/cask_test.rb
index d5b81facb..d5b81facb 100644
--- a/Library/Homebrew/test/test/cask_test.rb
+++ b/Library/Homebrew/test/cask_test.rb
diff --git a/Library/Homebrew/test/test/cat_test.rb b/Library/Homebrew/test/cat_test.rb
index bb37b5fde..bb37b5fde 100644
--- a/Library/Homebrew/test/test/cat_test.rb
+++ b/Library/Homebrew/test/cat_test.rb
diff --git a/Library/Homebrew/test/test/caveats_test.rb b/Library/Homebrew/test/caveats_test.rb
index 9eaac5792..9eaac5792 100644
--- a/Library/Homebrew/test/test/caveats_test.rb
+++ b/Library/Homebrew/test/caveats_test.rb
diff --git a/Library/Homebrew/test/test/cellar_formula_test.rb b/Library/Homebrew/test/cellar_formula_test.rb
index 38a934a7b..38a934a7b 100644
--- a/Library/Homebrew/test/test/cellar_formula_test.rb
+++ b/Library/Homebrew/test/cellar_formula_test.rb
diff --git a/Library/Homebrew/test/test/cellar_test.rb b/Library/Homebrew/test/cellar_test.rb
index 74d5389f8..74d5389f8 100644
--- a/Library/Homebrew/test/test/cellar_test.rb
+++ b/Library/Homebrew/test/cellar_test.rb
diff --git a/Library/Homebrew/test/test/checksum_test.rb b/Library/Homebrew/test/checksum_test.rb
index 5505f6824..5505f6824 100644
--- a/Library/Homebrew/test/test/checksum_test.rb
+++ b/Library/Homebrew/test/checksum_test.rb
diff --git a/Library/Homebrew/test/test/checksum_verification_test.rb b/Library/Homebrew/test/checksum_verification_test.rb
index 9017b528d..9017b528d 100644
--- a/Library/Homebrew/test/test/checksum_verification_test.rb
+++ b/Library/Homebrew/test/checksum_verification_test.rb
diff --git a/Library/Homebrew/test/test/cleaner_test.rb b/Library/Homebrew/test/cleaner_test.rb
index ac108421c..ac108421c 100644
--- a/Library/Homebrew/test/test/cleaner_test.rb
+++ b/Library/Homebrew/test/cleaner_test.rb
diff --git a/Library/Homebrew/test/test/cleanup_test.rb b/Library/Homebrew/test/cleanup_test.rb
index bb8e1cdc6..bb8e1cdc6 100644
--- a/Library/Homebrew/test/test/cleanup_test.rb
+++ b/Library/Homebrew/test/cleanup_test.rb
diff --git a/Library/Homebrew/test/test/command_test.rb b/Library/Homebrew/test/command_test.rb
index d5c7aaa88..d5c7aaa88 100644
--- a/Library/Homebrew/test/test/command_test.rb
+++ b/Library/Homebrew/test/command_test.rb
diff --git a/Library/Homebrew/test/test/commands_test.rb b/Library/Homebrew/test/commands_test.rb
index d44d2da0e..d44d2da0e 100644
--- a/Library/Homebrew/test/test/commands_test.rb
+++ b/Library/Homebrew/test/commands_test.rb
diff --git a/Library/Homebrew/test/test/compiler_failure_test.rb b/Library/Homebrew/test/compiler_failure_test.rb
index c0b74d128..c0b74d128 100644
--- a/Library/Homebrew/test/test/compiler_failure_test.rb
+++ b/Library/Homebrew/test/compiler_failure_test.rb
diff --git a/Library/Homebrew/test/test/compiler_selector_test.rb b/Library/Homebrew/test/compiler_selector_test.rb
index b1591bdbe..b1591bdbe 100644
--- a/Library/Homebrew/test/test/compiler_selector_test.rb
+++ b/Library/Homebrew/test/compiler_selector_test.rb
diff --git a/Library/Homebrew/test/test/config_test.rb b/Library/Homebrew/test/config_test.rb
index 81da4660a..81da4660a 100644
--- a/Library/Homebrew/test/test/config_test.rb
+++ b/Library/Homebrew/test/config_test.rb
diff --git a/Library/Homebrew/test/test/create_test.rb b/Library/Homebrew/test/create_test.rb
index aeee428aa..aeee428aa 100644
--- a/Library/Homebrew/test/test/create_test.rb
+++ b/Library/Homebrew/test/create_test.rb
diff --git a/Library/Homebrew/test/test/custom_command_test.rb b/Library/Homebrew/test/custom_command_test.rb
index 8d05bc6c7..8d05bc6c7 100644
--- a/Library/Homebrew/test/test/custom_command_test.rb
+++ b/Library/Homebrew/test/custom_command_test.rb
diff --git a/Library/Homebrew/test/test/dependencies_test.rb b/Library/Homebrew/test/dependencies_test.rb
index db3b78226..db3b78226 100644
--- a/Library/Homebrew/test/test/dependencies_test.rb
+++ b/Library/Homebrew/test/dependencies_test.rb
diff --git a/Library/Homebrew/test/test/dependency_collector_test.rb b/Library/Homebrew/test/dependency_collector_test.rb
index 1c7f70118..1c7f70118 100644
--- a/Library/Homebrew/test/test/dependency_collector_test.rb
+++ b/Library/Homebrew/test/dependency_collector_test.rb
diff --git a/Library/Homebrew/test/test/dependency_expansion_test.rb b/Library/Homebrew/test/dependency_expansion_test.rb
index 9d6de35e2..9d6de35e2 100644
--- a/Library/Homebrew/test/test/dependency_expansion_test.rb
+++ b/Library/Homebrew/test/dependency_expansion_test.rb
diff --git a/Library/Homebrew/test/test/dependency_test.rb b/Library/Homebrew/test/dependency_test.rb
index 65255995e..65255995e 100644
--- a/Library/Homebrew/test/test/dependency_test.rb
+++ b/Library/Homebrew/test/dependency_test.rb
diff --git a/Library/Homebrew/test/test/deps_test.rb b/Library/Homebrew/test/deps_test.rb
index 01639857c..01639857c 100644
--- a/Library/Homebrew/test/test/deps_test.rb
+++ b/Library/Homebrew/test/deps_test.rb
diff --git a/Library/Homebrew/test/test/desc_test.rb b/Library/Homebrew/test/desc_test.rb
index 2ba498135..2ba498135 100644
--- a/Library/Homebrew/test/test/desc_test.rb
+++ b/Library/Homebrew/test/desc_test.rb
diff --git a/Library/Homebrew/test/test/descriptions_test.rb b/Library/Homebrew/test/descriptions_test.rb
index de38fdbd1..de38fdbd1 100644
--- a/Library/Homebrew/test/test/descriptions_test.rb
+++ b/Library/Homebrew/test/descriptions_test.rb
diff --git a/Library/Homebrew/test/test/diagnostic_test.rb b/Library/Homebrew/test/diagnostic_test.rb
index aa2e44cfc..aa2e44cfc 100644
--- a/Library/Homebrew/test/test/diagnostic_test.rb
+++ b/Library/Homebrew/test/diagnostic_test.rb
diff --git a/Library/Homebrew/test/test/doctor_test.rb b/Library/Homebrew/test/doctor_test.rb
index d2dc871f4..d2dc871f4 100644
--- a/Library/Homebrew/test/test/doctor_test.rb
+++ b/Library/Homebrew/test/doctor_test.rb
diff --git a/Library/Homebrew/test/test/download_strategies_test.rb b/Library/Homebrew/test/download_strategies_test.rb
index 87218fb12..87218fb12 100644
--- a/Library/Homebrew/test/test/download_strategies_test.rb
+++ b/Library/Homebrew/test/download_strategies_test.rb
diff --git a/Library/Homebrew/test/test/edit_test.rb b/Library/Homebrew/test/edit_test.rb
index 9b6ded651..9b6ded651 100644
--- a/Library/Homebrew/test/test/edit_test.rb
+++ b/Library/Homebrew/test/edit_test.rb
diff --git a/Library/Homebrew/test/test/exceptions_test.rb b/Library/Homebrew/test/exceptions_test.rb
index 689531c6e..689531c6e 100644
--- a/Library/Homebrew/test/test/exceptions_test.rb
+++ b/Library/Homebrew/test/exceptions_test.rb
diff --git a/Library/Homebrew/test/test/fetch_test.rb b/Library/Homebrew/test/fetch_test.rb
index e08e545e3..e08e545e3 100644
--- a/Library/Homebrew/test/test/fetch_test.rb
+++ b/Library/Homebrew/test/fetch_test.rb
diff --git a/Library/Homebrew/test/test/formula_installer_bottle_test.rb b/Library/Homebrew/test/formula_installer_bottle_test.rb
index 6a891f159..6a891f159 100644
--- a/Library/Homebrew/test/test/formula_installer_bottle_test.rb
+++ b/Library/Homebrew/test/formula_installer_bottle_test.rb
diff --git a/Library/Homebrew/test/test/formula_installer_test.rb b/Library/Homebrew/test/formula_installer_test.rb
index 652548bd7..652548bd7 100644
--- a/Library/Homebrew/test/test/formula_installer_test.rb
+++ b/Library/Homebrew/test/formula_installer_test.rb
diff --git a/Library/Homebrew/test/test/formula_lock_test.rb b/Library/Homebrew/test/formula_lock_test.rb
index 80ee9dd25..80ee9dd25 100644
--- a/Library/Homebrew/test/test/formula_lock_test.rb
+++ b/Library/Homebrew/test/formula_lock_test.rb
diff --git a/Library/Homebrew/test/test/formula_pin_test.rb b/Library/Homebrew/test/formula_pin_test.rb
index 297d7703e..297d7703e 100644
--- a/Library/Homebrew/test/test/formula_pin_test.rb
+++ b/Library/Homebrew/test/formula_pin_test.rb
diff --git a/Library/Homebrew/test/test/formula_spec_selection_test.rb b/Library/Homebrew/test/formula_spec_selection_test.rb
index 7148df173..7148df173 100644
--- a/Library/Homebrew/test/test/formula_spec_selection_test.rb
+++ b/Library/Homebrew/test/formula_spec_selection_test.rb
diff --git a/Library/Homebrew/test/test/formula_support_test.rb b/Library/Homebrew/test/formula_support_test.rb
index c0a79f950..c0a79f950 100644
--- a/Library/Homebrew/test/test/formula_support_test.rb
+++ b/Library/Homebrew/test/formula_support_test.rb
diff --git a/Library/Homebrew/test/test/formula_test.rb b/Library/Homebrew/test/formula_test.rb
index eef60a3e5..eef60a3e5 100644
--- a/Library/Homebrew/test/test/formula_test.rb
+++ b/Library/Homebrew/test/formula_test.rb
diff --git a/Library/Homebrew/test/test/formula_validation_test.rb b/Library/Homebrew/test/formula_validation_test.rb
index c40eb6733..c40eb6733 100644
--- a/Library/Homebrew/test/test/formula_validation_test.rb
+++ b/Library/Homebrew/test/formula_validation_test.rb
diff --git a/Library/Homebrew/test/test/formulary_test.rb b/Library/Homebrew/test/formulary_test.rb
index 3d88c8407..3d88c8407 100644
--- a/Library/Homebrew/test/test/formulary_test.rb
+++ b/Library/Homebrew/test/formulary_test.rb
diff --git a/Library/Homebrew/test/test/gpg2_requirement_test.rb b/Library/Homebrew/test/gpg2_requirement_test.rb
index fa7fc9ea4..fa7fc9ea4 100644
--- a/Library/Homebrew/test/test/gpg2_requirement_test.rb
+++ b/Library/Homebrew/test/gpg2_requirement_test.rb
diff --git a/Library/Homebrew/test/test/gpg_test.rb b/Library/Homebrew/test/gpg_test.rb
index 0374bdab4..0374bdab4 100644
--- a/Library/Homebrew/test/test/gpg_test.rb
+++ b/Library/Homebrew/test/gpg_test.rb
diff --git a/Library/Homebrew/test/test/hardware_test.rb b/Library/Homebrew/test/hardware_test.rb
index 2bea5387d..2bea5387d 100644
--- a/Library/Homebrew/test/test/hardware_test.rb
+++ b/Library/Homebrew/test/hardware_test.rb
diff --git a/Library/Homebrew/test/test/help_test.rb b/Library/Homebrew/test/help_test.rb
index 92dd99721..92dd99721 100644
--- a/Library/Homebrew/test/test/help_test.rb
+++ b/Library/Homebrew/test/help_test.rb
diff --git a/Library/Homebrew/test/test/home_test.rb b/Library/Homebrew/test/home_test.rb
index ff06b72c1..ff06b72c1 100644
--- a/Library/Homebrew/test/test/home_test.rb
+++ b/Library/Homebrew/test/home_test.rb
diff --git a/Library/Homebrew/test/test/info_test.rb b/Library/Homebrew/test/info_test.rb
index f71044bf0..f71044bf0 100644
--- a/Library/Homebrew/test/test/info_test.rb
+++ b/Library/Homebrew/test/info_test.rb
diff --git a/Library/Homebrew/test/test/inreplace_test.rb b/Library/Homebrew/test/inreplace_test.rb
index 0e62f9d3f..0e62f9d3f 100644
--- a/Library/Homebrew/test/test/inreplace_test.rb
+++ b/Library/Homebrew/test/inreplace_test.rb
diff --git a/Library/Homebrew/test/test/install_test.rb b/Library/Homebrew/test/install_test.rb
index fa1057a02..fa1057a02 100644
--- a/Library/Homebrew/test/test/install_test.rb
+++ b/Library/Homebrew/test/install_test.rb
diff --git a/Library/Homebrew/test/test/irb_test.rb b/Library/Homebrew/test/irb_test.rb
index 832ca39a5..832ca39a5 100644
--- a/Library/Homebrew/test/test/irb_test.rb
+++ b/Library/Homebrew/test/irb_test.rb
diff --git a/Library/Homebrew/test/test/json_test.rb b/Library/Homebrew/test/json_test.rb
index 14d2f2b4c..14d2f2b4c 100644
--- a/Library/Homebrew/test/test/json_test.rb
+++ b/Library/Homebrew/test/json_test.rb
diff --git a/Library/Homebrew/test/test/keg_test.rb b/Library/Homebrew/test/keg_test.rb
index fdc739c9d..fdc739c9d 100644
--- a/Library/Homebrew/test/test/keg_test.rb
+++ b/Library/Homebrew/test/keg_test.rb
diff --git a/Library/Homebrew/test/test/language_go_test.rb b/Library/Homebrew/test/language_go_test.rb
index 692a5d2cc..692a5d2cc 100644
--- a/Library/Homebrew/test/test/language_go_test.rb
+++ b/Library/Homebrew/test/language_go_test.rb
diff --git a/Library/Homebrew/test/test/language_module_requirement_test.rb b/Library/Homebrew/test/language_module_requirement_test.rb
index dfa992287..dfa992287 100644
--- a/Library/Homebrew/test/test/language_module_requirement_test.rb
+++ b/Library/Homebrew/test/language_module_requirement_test.rb
diff --git a/Library/Homebrew/test/test/language_python_test.rb b/Library/Homebrew/test/language_python_test.rb
index d1e3867f7..d1e3867f7 100644
--- a/Library/Homebrew/test/test/language_python_test.rb
+++ b/Library/Homebrew/test/language_python_test.rb
diff --git a/Library/Homebrew/test/test/leaves_test.rb b/Library/Homebrew/test/leaves_test.rb
index f73fba1ea..f73fba1ea 100644
--- a/Library/Homebrew/test/test/leaves_test.rb
+++ b/Library/Homebrew/test/leaves_test.rb
diff --git a/Library/Homebrew/test/test/link_test.rb b/Library/Homebrew/test/link_test.rb
index 062caa0c0..062caa0c0 100644
--- a/Library/Homebrew/test/test/link_test.rb
+++ b/Library/Homebrew/test/link_test.rb
diff --git a/Library/Homebrew/test/test/linkapps_test.rb b/Library/Homebrew/test/linkapps_test.rb
index 4c5b8ec13..4c5b8ec13 100644
--- a/Library/Homebrew/test/test/linkapps_test.rb
+++ b/Library/Homebrew/test/linkapps_test.rb
diff --git a/Library/Homebrew/test/test/list_test.rb b/Library/Homebrew/test/list_test.rb
index 3c691e3ad..3c691e3ad 100644
--- a/Library/Homebrew/test/test/list_test.rb
+++ b/Library/Homebrew/test/list_test.rb
diff --git a/Library/Homebrew/test/test/log_formula_test.rb b/Library/Homebrew/test/log_formula_test.rb
index bb6a1f661..bb6a1f661 100644
--- a/Library/Homebrew/test/test/log_formula_test.rb
+++ b/Library/Homebrew/test/log_formula_test.rb
diff --git a/Library/Homebrew/test/test/log_test.rb b/Library/Homebrew/test/log_test.rb
index b2e150ccd..b2e150ccd 100644
--- a/Library/Homebrew/test/test/log_test.rb
+++ b/Library/Homebrew/test/log_test.rb
diff --git a/Library/Homebrew/test/test/migrate_test.rb b/Library/Homebrew/test/migrate_test.rb
index 17929d038..17929d038 100644
--- a/Library/Homebrew/test/test/migrate_test.rb
+++ b/Library/Homebrew/test/migrate_test.rb
diff --git a/Library/Homebrew/test/test/migrator_test.rb b/Library/Homebrew/test/migrator_test.rb
index 8a2b6ad63..8a2b6ad63 100644
--- a/Library/Homebrew/test/test/migrator_test.rb
+++ b/Library/Homebrew/test/migrator_test.rb
diff --git a/Library/Homebrew/test/test/missing_test.rb b/Library/Homebrew/test/missing_test.rb
index 4f20d8a7a..4f20d8a7a 100644
--- a/Library/Homebrew/test/test/missing_test.rb
+++ b/Library/Homebrew/test/missing_test.rb
diff --git a/Library/Homebrew/test/test/mpi_requirement_test.rb b/Library/Homebrew/test/mpi_requirement_test.rb
index e0f97e8ee..e0f97e8ee 100644
--- a/Library/Homebrew/test/test/mpi_requirement_test.rb
+++ b/Library/Homebrew/test/mpi_requirement_test.rb
diff --git a/Library/Homebrew/test/test/options_test.rb b/Library/Homebrew/test/options_test.rb
index e7189a604..e7189a604 100644
--- a/Library/Homebrew/test/test/options_test.rb
+++ b/Library/Homebrew/test/options_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/blacklist_test.rb b/Library/Homebrew/test/os/mac/blacklist_test.rb
index 26dd84ed9..26dd84ed9 100644
--- a/Library/Homebrew/test/test/os/mac/blacklist_test.rb
+++ b/Library/Homebrew/test/os/mac/blacklist_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb b/Library/Homebrew/test/os/mac/bottle_collector_test.rb
index 2f88050ae..2f88050ae 100644
--- a/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
+++ b/Library/Homebrew/test/os/mac/bottle_collector_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb b/Library/Homebrew/test/os/mac/bottle_tag_test.rb
index 996bd4d53..996bd4d53 100644
--- a/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
+++ b/Library/Homebrew/test/os/mac/bottle_tag_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb b/Library/Homebrew/test/os/mac/dependency_collector_test.rb
index 4fdf3ebe4..4fdf3ebe4 100644
--- a/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
+++ b/Library/Homebrew/test/os/mac/dependency_collector_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/diagnostic_test.rb b/Library/Homebrew/test/os/mac/diagnostic_test.rb
index 655aa1d46..655aa1d46 100644
--- a/Library/Homebrew/test/test/os/mac/diagnostic_test.rb
+++ b/Library/Homebrew/test/os/mac/diagnostic_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/keg_test.rb b/Library/Homebrew/test/os/mac/keg_test.rb
index e79cbc921..e79cbc921 100644
--- a/Library/Homebrew/test/test/os/mac/keg_test.rb
+++ b/Library/Homebrew/test/os/mac/keg_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/language_test.rb b/Library/Homebrew/test/os/mac/language_test.rb
index e328db5e0..e328db5e0 100644
--- a/Library/Homebrew/test/test/os/mac/language_test.rb
+++ b/Library/Homebrew/test/os/mac/language_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/mach_test.rb b/Library/Homebrew/test/os/mac/mach_test.rb
index a42f7316b..a42f7316b 100644
--- a/Library/Homebrew/test/test/os/mac/mach_test.rb
+++ b/Library/Homebrew/test/os/mac/mach_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/version_test.rb b/Library/Homebrew/test/os/mac/version_test.rb
index f702c7097..f702c7097 100644
--- a/Library/Homebrew/test/test/os/mac/version_test.rb
+++ b/Library/Homebrew/test/os/mac/version_test.rb
diff --git a/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb b/Library/Homebrew/test/os/mac/x11_requirement_test.rb
index 102937cb5..102937cb5 100644
--- a/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
+++ b/Library/Homebrew/test/os/mac/x11_requirement_test.rb
diff --git a/Library/Homebrew/test/test/outdated_test.rb b/Library/Homebrew/test/outdated_test.rb
index 3e7148ded..3e7148ded 100644
--- a/Library/Homebrew/test/test/outdated_test.rb
+++ b/Library/Homebrew/test/outdated_test.rb
diff --git a/Library/Homebrew/test/test/patch_test.rb b/Library/Homebrew/test/patch_test.rb
index 62624720e..62624720e 100644
--- a/Library/Homebrew/test/test/patch_test.rb
+++ b/Library/Homebrew/test/patch_test.rb
diff --git a/Library/Homebrew/test/test/patching_test.rb b/Library/Homebrew/test/patching_test.rb
index ac14c8e1e..ac14c8e1e 100644
--- a/Library/Homebrew/test/test/patching_test.rb
+++ b/Library/Homebrew/test/patching_test.rb
diff --git a/Library/Homebrew/test/test/pathname_test.rb b/Library/Homebrew/test/pathname_test.rb
index 2f6360719..2f6360719 100644
--- a/Library/Homebrew/test/test/pathname_test.rb
+++ b/Library/Homebrew/test/pathname_test.rb
diff --git a/Library/Homebrew/test/test/pin_unpin_test.rb b/Library/Homebrew/test/pin_unpin_test.rb
index 65fb9e4da..65fb9e4da 100644
--- a/Library/Homebrew/test/test/pin_unpin_test.rb
+++ b/Library/Homebrew/test/pin_unpin_test.rb
diff --git a/Library/Homebrew/test/test/pkg_version_test.rb b/Library/Homebrew/test/pkg_version_test.rb
index ff7896f8b..ff7896f8b 100644
--- a/Library/Homebrew/test/test/pkg_version_test.rb
+++ b/Library/Homebrew/test/pkg_version_test.rb
diff --git a/Library/Homebrew/test/test/prefix_formula_test.rb b/Library/Homebrew/test/prefix_formula_test.rb
index eb5970d3e..eb5970d3e 100644
--- a/Library/Homebrew/test/test/prefix_formula_test.rb
+++ b/Library/Homebrew/test/prefix_formula_test.rb
diff --git a/Library/Homebrew/test/test/prefix_test.rb b/Library/Homebrew/test/prefix_test.rb
index a3ae75542..a3ae75542 100644
--- a/Library/Homebrew/test/test/prefix_test.rb
+++ b/Library/Homebrew/test/prefix_test.rb
diff --git a/Library/Homebrew/test/test/prune_test.rb b/Library/Homebrew/test/prune_test.rb
index 8fa5df7b7..8fa5df7b7 100644
--- a/Library/Homebrew/test/test/prune_test.rb
+++ b/Library/Homebrew/test/prune_test.rb
diff --git a/Library/Homebrew/test/test/pull_offline_test.rb b/Library/Homebrew/test/pull_offline_test.rb
index c9d46cd74..c9d46cd74 100644
--- a/Library/Homebrew/test/test/pull_offline_test.rb
+++ b/Library/Homebrew/test/pull_offline_test.rb
diff --git a/Library/Homebrew/test/test/pull_test.rb b/Library/Homebrew/test/pull_test.rb
index 445d73cb1..445d73cb1 100644
--- a/Library/Homebrew/test/test/pull_test.rb
+++ b/Library/Homebrew/test/pull_test.rb
diff --git a/Library/Homebrew/test/test/readall_test.rb b/Library/Homebrew/test/readall_test.rb
index 3eec79dd8..3eec79dd8 100644
--- a/Library/Homebrew/test/test/readall_test.rb
+++ b/Library/Homebrew/test/readall_test.rb
diff --git a/Library/Homebrew/test/test/reinstall_pinned_test.rb b/Library/Homebrew/test/reinstall_pinned_test.rb
index 80f5518ea..80f5518ea 100644
--- a/Library/Homebrew/test/test/reinstall_pinned_test.rb
+++ b/Library/Homebrew/test/reinstall_pinned_test.rb
diff --git a/Library/Homebrew/test/test/reinstall_test.rb b/Library/Homebrew/test/reinstall_test.rb
index 73877b35d..73877b35d 100644
--- a/Library/Homebrew/test/test/reinstall_test.rb
+++ b/Library/Homebrew/test/reinstall_test.rb
diff --git a/Library/Homebrew/test/test/repository_test.rb b/Library/Homebrew/test/repository_test.rb
index 77967a58d..77967a58d 100644
--- a/Library/Homebrew/test/test/repository_test.rb
+++ b/Library/Homebrew/test/repository_test.rb
diff --git a/Library/Homebrew/test/test/requirement_test.rb b/Library/Homebrew/test/requirement_test.rb
index 580d42bfa..580d42bfa 100644
--- a/Library/Homebrew/test/test/requirement_test.rb
+++ b/Library/Homebrew/test/requirement_test.rb
diff --git a/Library/Homebrew/test/test/resource_test.rb b/Library/Homebrew/test/resource_test.rb
index c1b526cb2..c1b526cb2 100644
--- a/Library/Homebrew/test/test/resource_test.rb
+++ b/Library/Homebrew/test/resource_test.rb
diff --git a/Library/Homebrew/test/test/sandbox_test.rb b/Library/Homebrew/test/sandbox_test.rb
index 2a062cb10..2a062cb10 100644
--- a/Library/Homebrew/test/test/sandbox_test.rb
+++ b/Library/Homebrew/test/sandbox_test.rb
diff --git a/Library/Homebrew/test/test/search_remote_tap_test.rb b/Library/Homebrew/test/search_remote_tap_test.rb
index 9dd9ee654..9dd9ee654 100644
--- a/Library/Homebrew/test/test/search_remote_tap_test.rb
+++ b/Library/Homebrew/test/search_remote_tap_test.rb
diff --git a/Library/Homebrew/test/test/search_test.rb b/Library/Homebrew/test/search_test.rb
index 70b6f01fb..70b6f01fb 100644
--- a/Library/Homebrew/test/test/search_test.rb
+++ b/Library/Homebrew/test/search_test.rb
diff --git a/Library/Homebrew/test/test/services_test.rb b/Library/Homebrew/test/services_test.rb
index 280aeb9f4..280aeb9f4 100644
--- a/Library/Homebrew/test/test/services_test.rb
+++ b/Library/Homebrew/test/services_test.rb
diff --git a/Library/Homebrew/test/test/sh_test.rb b/Library/Homebrew/test/sh_test.rb
index 48fcdc54a..48fcdc54a 100644
--- a/Library/Homebrew/test/test/sh_test.rb
+++ b/Library/Homebrew/test/sh_test.rb
diff --git a/Library/Homebrew/test/test/shell_test.rb b/Library/Homebrew/test/shell_test.rb
index 877acb5c8..877acb5c8 100644
--- a/Library/Homebrew/test/test/shell_test.rb
+++ b/Library/Homebrew/test/shell_test.rb
diff --git a/Library/Homebrew/test/test/software_spec_test.rb b/Library/Homebrew/test/software_spec_test.rb
index d9226f8c3..d9226f8c3 100644
--- a/Library/Homebrew/test/test/software_spec_test.rb
+++ b/Library/Homebrew/test/software_spec_test.rb
diff --git a/Library/Homebrew/test/test/stdlib_test.rb b/Library/Homebrew/test/stdlib_test.rb
index ee53e7c8c..ee53e7c8c 100644
--- a/Library/Homebrew/test/test/stdlib_test.rb
+++ b/Library/Homebrew/test/stdlib_test.rb
diff --git a/Library/Homebrew/test/test/string_test.rb b/Library/Homebrew/test/string_test.rb
index 497c4badb..497c4badb 100644
--- a/Library/Homebrew/test/test/string_test.rb
+++ b/Library/Homebrew/test/string_test.rb
diff --git a/Library/Homebrew/test/test/switch_test.rb b/Library/Homebrew/test/switch_test.rb
index af1926c39..af1926c39 100644
--- a/Library/Homebrew/test/test/switch_test.rb
+++ b/Library/Homebrew/test/switch_test.rb
diff --git a/Library/Homebrew/test/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb
index 76c9aacc9..76c9aacc9 100644
--- a/Library/Homebrew/test/test/tab_test.rb
+++ b/Library/Homebrew/test/tab_test.rb
diff --git a/Library/Homebrew/test/test/tap_new_test.rb b/Library/Homebrew/test/tap_new_test.rb
index 261a334f0..261a334f0 100644
--- a/Library/Homebrew/test/test/tap_new_test.rb
+++ b/Library/Homebrew/test/tap_new_test.rb
diff --git a/Library/Homebrew/test/test/tap_test.rb b/Library/Homebrew/test/tap_test.rb
index b950cd166..b950cd166 100644
--- a/Library/Homebrew/test/test/tap_test.rb
+++ b/Library/Homebrew/test/tap_test.rb
diff --git a/Library/Homebrew/test/test/test_formula_test.rb b/Library/Homebrew/test/test_formula_test.rb
index 5ad2db9e9..5ad2db9e9 100644
--- a/Library/Homebrew/test/test/test_formula_test.rb
+++ b/Library/Homebrew/test/test_formula_test.rb
diff --git a/Library/Homebrew/test/test/uninstall_test.rb b/Library/Homebrew/test/uninstall_test.rb
index 70a694353..70a694353 100644
--- a/Library/Homebrew/test/test/uninstall_test.rb
+++ b/Library/Homebrew/test/uninstall_test.rb
diff --git a/Library/Homebrew/test/test/unlink_test.rb b/Library/Homebrew/test/unlink_test.rb
index 6d5cefc67..6d5cefc67 100644
--- a/Library/Homebrew/test/test/unlink_test.rb
+++ b/Library/Homebrew/test/unlink_test.rb
diff --git a/Library/Homebrew/test/test/unlinkapps_test.rb b/Library/Homebrew/test/unlinkapps_test.rb
index 9d9672199..9d9672199 100644
--- a/Library/Homebrew/test/test/unlinkapps_test.rb
+++ b/Library/Homebrew/test/unlinkapps_test.rb
diff --git a/Library/Homebrew/test/test/unpack_test.rb b/Library/Homebrew/test/unpack_test.rb
index bbff6ad1c..bbff6ad1c 100644
--- a/Library/Homebrew/test/test/unpack_test.rb
+++ b/Library/Homebrew/test/unpack_test.rb
diff --git a/Library/Homebrew/test/test/update_report_test.rb b/Library/Homebrew/test/update_report_test.rb
index 6b6cec6ce..6b6cec6ce 100644
--- a/Library/Homebrew/test/test/update_report_test.rb
+++ b/Library/Homebrew/test/update_report_test.rb
diff --git a/Library/Homebrew/test/test/upgrade_test.rb b/Library/Homebrew/test/upgrade_test.rb
index f3f5dccc7..f3f5dccc7 100644
--- a/Library/Homebrew/test/test/upgrade_test.rb
+++ b/Library/Homebrew/test/upgrade_test.rb
diff --git a/Library/Homebrew/test/test/uses_test.rb b/Library/Homebrew/test/uses_test.rb
index 2b1555417..2b1555417 100644
--- a/Library/Homebrew/test/test/uses_test.rb
+++ b/Library/Homebrew/test/uses_test.rb
diff --git a/Library/Homebrew/test/test/utils/tty_test.rb b/Library/Homebrew/test/utils/tty_test.rb
index 09f092cbd..09f092cbd 100644
--- a/Library/Homebrew/test/test/utils/tty_test.rb
+++ b/Library/Homebrew/test/utils/tty_test.rb
diff --git a/Library/Homebrew/test/test/utils_test.rb b/Library/Homebrew/test/utils_test.rb
index 146f57b49..146f57b49 100644
--- a/Library/Homebrew/test/test/utils_test.rb
+++ b/Library/Homebrew/test/utils_test.rb
diff --git a/Library/Homebrew/test/test/version_test.rb b/Library/Homebrew/test/version_test.rb
index e7ffbc4f6..e7ffbc4f6 100644
--- a/Library/Homebrew/test/test/version_test.rb
+++ b/Library/Homebrew/test/version_test.rb
diff --git a/Library/Homebrew/test/test/versions_test.rb b/Library/Homebrew/test/versions_test.rb
index a6e922178..a6e922178 100644
--- a/Library/Homebrew/test/test/versions_test.rb
+++ b/Library/Homebrew/test/versions_test.rb
diff --git a/Library/Homebrew/test/test/x11_requirement_test.rb b/Library/Homebrew/test/x11_requirement_test.rb
index b82a59e53..b82a59e53 100644
--- a/Library/Homebrew/test/test/x11_requirement_test.rb
+++ b/Library/Homebrew/test/x11_requirement_test.rb