From 6b6b27126d7ecc1dde9a6bc166a7e1daa3af35d2 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Fri, 21 Oct 2016 08:57:39 +0200
Subject: [PATCH] Reorder and rename test files.

---
 Library/Homebrew/dev-cmd/tests.rb             | 14 +++---
 .../test/{test_ARGV.rb => test/ARGV_test.rb}  |  0
 .../test/{test_ENV.rb => test/ENV_test.rb}    |  0
 .../analytics_test.rb}                        |  0
 .../{test_audit.rb => test/audit_test.rb}     |  0
 .../test/{test_bash.rb => test/bash_test.rb}  |  0
 .../blacklist_test.rb}                        |  0
 .../bottle_collector_test.rb}                 |  0
 .../bottle_filename_test.rb}                  |  0
 .../bottle_hooks_test.rb}                     |  0
 .../{test_bottle.rb => test/bottle_test.rb}   |  0
 .../build_environment_test.rb}                |  0
 .../build_options_test.rb}                    |  0
 .../{test_bundle.rb => test/bundle_test.rb}   |  0
 .../cache_formula_test.rb}                    |  0
 .../{test_cache.rb => test/cache_test.rb}     |  0
 .../test/{test_cask.rb => test/cask_test.rb}  |  0
 .../test/{test_cat.rb => test/cat_test.rb}    |  0
 .../{test_caveats.rb => test/caveats_test.rb} |  0
 .../cellar_formula_test.rb}                   |  0
 .../{test_cellar.rb => test/cellar_test.rb}   |  0
 .../checksum_test.rb}                         |  0
 .../checksum_verification_test.rb}            |  0
 .../{test_cleaner.rb => test/cleaner_test.rb} |  0
 .../{test_cleanup.rb => test/cleanup_test.rb} |  0
 .../{test_command.rb => test/command_test.rb} |  0
 .../commands_test.rb}                         |  0
 .../compiler_failure_test.rb}                 |  0
 .../compiler_selector_test.rb}                |  0
 .../{test_config.rb => test/config_test.rb}   |  0
 .../{test_create.rb => test/create_test.rb}   |  2 +-
 .../custom_command_test.rb}                   |  0
 .../dependencies_test.rb}                     |  0
 .../dependency_collector_test.rb}             |  0
 .../dependency_expansion_test.rb}             |  0
 .../dependency_test.rb}                       |  0
 .../test/{test_deps.rb => test/deps_test.rb}  |  0
 .../test/{test_desc.rb => test/desc_test.rb}  |  0
 .../descriptions_test.rb}                     |  0
 .../diagnostic_test.rb}                       |  0
 .../{test_doctor.rb => test/doctor_test.rb}   |  0
 .../download_strategies_test.rb}              |  0
 .../test/{test_edit.rb => test/edit_test.rb}  |  0
 .../exceptions_test.rb}                       |  0
 .../{test_fetch.rb => test/fetch_test.rb}     |  0
 .../formula_installer_bottle_test.rb}         |  0
 .../formula_installer_test.rb}                |  0
 .../formula_lock_test.rb}                     |  0
 .../formula_pin_test.rb}                      |  0
 .../formula_spec_selection_test.rb}           |  0
 .../formula_support_test.rb}                  |  0
 .../{test_formula.rb => test/formula_test.rb} |  0
 .../formula_validation_test.rb}               |  0
 .../formulary_test.rb}                        |  2 +-
 .../gpg2_requirement_test.rb}                 |  0
 .../test/{test_gpg.rb => test/gpg_test.rb}    |  0
 .../hardware_test.rb}                         |  0
 .../test/{test_help.rb => test/help_test.rb}  |  0
 .../test/{test_home.rb => test/home_test.rb}  |  0
 .../test/{test_info.rb => test/info_test.rb}  |  0
 .../inreplace_test.rb}                        |  0
 .../{test_install.rb => test/install_test.rb} |  0
 .../test/{test_irb.rb => test/irb_test.rb}    |  0
 .../test/{test_json.rb => test/json_test.rb}  |  0
 .../test/{test_keg.rb => test/keg_test.rb}    |  0
 .../language_go_test.rb}                      |  0
 .../language_module_requirement_test.rb}      |  0
 .../language_python_test.rb}                  |  0
 .../{test_leaves.rb => test/leaves_test.rb}   |  0
 .../test/{test_link.rb => test/link_test.rb}  |  0
 .../linkapps_test.rb}                         |  0
 .../test/{test_list.rb => test/list_test.rb}  |  0
 .../log_formula_test.rb}                      |  0
 .../test/{test_log.rb => test/log_test.rb}    |  0
 .../{test_migrate.rb => test/migrate_test.rb} |  0
 .../migrator_test.rb}                         |  0
 .../{test_missing.rb => test/missing_test.rb} |  0
 .../mpi_requirement_test.rb}                  |  0
 .../{test_options.rb => test/options_test.rb} |  0
 .../os/mac/blacklist_test.rb}                 |  0
 .../os/mac/bottle_collector_test.rb}          |  0
 .../os/mac/bottle_tag_test.rb}                |  0
 .../os/mac/dependency_collector_test.rb}      |  0
 .../os/mac/diagnostic_test.rb}                |  0
 .../os/mac/keg_test.rb}                       |  0
 .../os/mac/language_test.rb}                  |  0
 .../os/mac/mach_test.rb}                      |  0
 .../os/mac/version_test.rb}                   |  0
 .../os/mac/x11_requirement_test.rb}           |  0
 .../outdated_test.rb}                         |  0
 .../{test_patch.rb => test/patch_test.rb}     |  0
 .../patching_test.rb}                         |  0
 .../pathname_test.rb}                         |  0
 .../pin_unpin_test.rb}                        |  0
 .../pkg_version_test.rb}                      |  0
 .../prefix_formula_test.rb}                   |  0
 .../{test_prefix.rb => test/prefix_test.rb}   |  0
 .../{test_prune.rb => test/prune_test.rb}     |  0
 .../pull_offline_test.rb}                     |  0
 .../test/{test_pull.rb => test/pull_test.rb}  |  0
 .../{test_readall.rb => test/readall_test.rb} |  0
 .../reinstall_pinned_test.rb}                 |  0
 .../reinstall_test.rb}                        |  0
 .../repository_test.rb}                       |  0
 .../requirement_test.rb}                      |  0
 .../resource_test.rb}                         |  0
 .../{test_sandbox.rb => test/sandbox_test.rb} |  0
 .../search_remote_tap_test.rb}                |  0
 .../{test_search.rb => test/search_test.rb}   |  0
 .../services_test.rb}                         |  0
 .../test/{test_sh.rb => test/sh_test.rb}      |  0
 .../{test_shell.rb => test/shell_test.rb}     |  0
 .../software_spec_test.rb}                    |  0
 .../{test_stdlib.rb => test/stdlib_test.rb}   |  0
 .../{test_string.rb => test/string_test.rb}   |  0
 .../{test_switch.rb => test/switch_test.rb}   |  0
 .../test/{test_tab.rb => test/tab_test.rb}    |  0
 .../{test_tap_new.rb => test/tap_new_test.rb} |  0
 .../test/{test_tap.rb => test/tap_test.rb}    |  0
 .../test_formula_test.rb}                     |  0
 .../uninstall_test.rb}                        |  0
 .../{test_unlink.rb => test/unlink_test.rb}   |  0
 .../unlinkapps_test.rb}                       |  0
 .../{test_unpack.rb => test/unpack_test.rb}   |  0
 .../update_report_test.rb}                    |  0
 .../{test_upgrade.rb => test/upgrade_test.rb} |  0
 .../test/{test_uses.rb => test/uses_test.rb}  |  0
 Library/Homebrew/test/test/utils/tty_test.rb  | 46 +++++++++++++++++++
 .../{test_utils.rb => test/utils_test.rb}     | 44 ------------------
 .../{test_version.rb => test/version_test.rb} |  0
 .../versions_test.rb}                         |  0
 .../x11_requirement_test.rb}                  |  0
 132 files changed, 54 insertions(+), 54 deletions(-)
 rename Library/Homebrew/test/{test_ARGV.rb => test/ARGV_test.rb} (100%)
 rename Library/Homebrew/test/{test_ENV.rb => test/ENV_test.rb} (100%)
 rename Library/Homebrew/test/{test_analytics.rb => test/analytics_test.rb} (100%)
 rename Library/Homebrew/test/{test_audit.rb => test/audit_test.rb} (100%)
 rename Library/Homebrew/test/{test_bash.rb => test/bash_test.rb} (100%)
 rename Library/Homebrew/test/{test_blacklist.rb => test/blacklist_test.rb} (100%)
 rename Library/Homebrew/test/{test_bottle_collector.rb => test/bottle_collector_test.rb} (100%)
 rename Library/Homebrew/test/{test_bottle_filename.rb => test/bottle_filename_test.rb} (100%)
 rename Library/Homebrew/test/{test_bottle_hooks.rb => test/bottle_hooks_test.rb} (100%)
 rename Library/Homebrew/test/{test_bottle.rb => test/bottle_test.rb} (100%)
 rename Library/Homebrew/test/{test_build_environment.rb => test/build_environment_test.rb} (100%)
 rename Library/Homebrew/test/{test_build_options.rb => test/build_options_test.rb} (100%)
 rename Library/Homebrew/test/{test_bundle.rb => test/bundle_test.rb} (100%)
 rename Library/Homebrew/test/{test_cache_formula.rb => test/cache_formula_test.rb} (100%)
 rename Library/Homebrew/test/{test_cache.rb => test/cache_test.rb} (100%)
 rename Library/Homebrew/test/{test_cask.rb => test/cask_test.rb} (100%)
 rename Library/Homebrew/test/{test_cat.rb => test/cat_test.rb} (100%)
 rename Library/Homebrew/test/{test_caveats.rb => test/caveats_test.rb} (100%)
 rename Library/Homebrew/test/{test_cellar_formula.rb => test/cellar_formula_test.rb} (100%)
 rename Library/Homebrew/test/{test_cellar.rb => test/cellar_test.rb} (100%)
 rename Library/Homebrew/test/{test_checksum.rb => test/checksum_test.rb} (100%)
 rename Library/Homebrew/test/{test_checksum_verification.rb => test/checksum_verification_test.rb} (100%)
 rename Library/Homebrew/test/{test_cleaner.rb => test/cleaner_test.rb} (100%)
 rename Library/Homebrew/test/{test_cleanup.rb => test/cleanup_test.rb} (100%)
 rename Library/Homebrew/test/{test_command.rb => test/command_test.rb} (100%)
 rename Library/Homebrew/test/{test_commands.rb => test/commands_test.rb} (100%)
 rename Library/Homebrew/test/{test_compiler_failure.rb => test/compiler_failure_test.rb} (100%)
 rename Library/Homebrew/test/{test_compiler_selector.rb => test/compiler_selector_test.rb} (100%)
 rename Library/Homebrew/test/{test_config.rb => test/config_test.rb} (100%)
 rename Library/Homebrew/test/{test_create.rb => test/create_test.rb} (83%)
 rename Library/Homebrew/test/{test_custom_command.rb => test/custom_command_test.rb} (100%)
 rename Library/Homebrew/test/{test_dependencies.rb => test/dependencies_test.rb} (100%)
 rename Library/Homebrew/test/{test_dependency_collector.rb => test/dependency_collector_test.rb} (100%)
 rename Library/Homebrew/test/{test_dependency_expansion.rb => test/dependency_expansion_test.rb} (100%)
 rename Library/Homebrew/test/{test_dependency.rb => test/dependency_test.rb} (100%)
 rename Library/Homebrew/test/{test_deps.rb => test/deps_test.rb} (100%)
 rename Library/Homebrew/test/{test_desc.rb => test/desc_test.rb} (100%)
 rename Library/Homebrew/test/{test_descriptions.rb => test/descriptions_test.rb} (100%)
 rename Library/Homebrew/test/{test_diagnostic.rb => test/diagnostic_test.rb} (100%)
 rename Library/Homebrew/test/{test_doctor.rb => test/doctor_test.rb} (100%)
 rename Library/Homebrew/test/{test_download_strategies.rb => test/download_strategies_test.rb} (100%)
 rename Library/Homebrew/test/{test_edit.rb => test/edit_test.rb} (100%)
 rename Library/Homebrew/test/{test_exceptions.rb => test/exceptions_test.rb} (100%)
 rename Library/Homebrew/test/{test_fetch.rb => test/fetch_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_installer_bottle.rb => test/formula_installer_bottle_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_installer.rb => test/formula_installer_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_lock.rb => test/formula_lock_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_pin.rb => test/formula_pin_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_spec_selection.rb => test/formula_spec_selection_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_support.rb => test/formula_support_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula.rb => test/formula_test.rb} (100%)
 rename Library/Homebrew/test/{test_formula_validation.rb => test/formula_validation_test.rb} (100%)
 rename Library/Homebrew/test/{test_formulary.rb => test/formulary_test.rb} (98%)
 rename Library/Homebrew/test/{test_gpg2_requirement.rb => test/gpg2_requirement_test.rb} (100%)
 rename Library/Homebrew/test/{test_gpg.rb => test/gpg_test.rb} (100%)
 rename Library/Homebrew/test/{test_hardware.rb => test/hardware_test.rb} (100%)
 rename Library/Homebrew/test/{test_help.rb => test/help_test.rb} (100%)
 rename Library/Homebrew/test/{test_home.rb => test/home_test.rb} (100%)
 rename Library/Homebrew/test/{test_info.rb => test/info_test.rb} (100%)
 rename Library/Homebrew/test/{test_inreplace.rb => test/inreplace_test.rb} (100%)
 rename Library/Homebrew/test/{test_install.rb => test/install_test.rb} (100%)
 rename Library/Homebrew/test/{test_irb.rb => test/irb_test.rb} (100%)
 rename Library/Homebrew/test/{test_json.rb => test/json_test.rb} (100%)
 rename Library/Homebrew/test/{test_keg.rb => test/keg_test.rb} (100%)
 rename Library/Homebrew/test/{test_language_go.rb => test/language_go_test.rb} (100%)
 rename Library/Homebrew/test/{test_language_module_requirement.rb => test/language_module_requirement_test.rb} (100%)
 rename Library/Homebrew/test/{test_language_python.rb => test/language_python_test.rb} (100%)
 rename Library/Homebrew/test/{test_leaves.rb => test/leaves_test.rb} (100%)
 rename Library/Homebrew/test/{test_link.rb => test/link_test.rb} (100%)
 rename Library/Homebrew/test/{test_linkapps.rb => test/linkapps_test.rb} (100%)
 rename Library/Homebrew/test/{test_list.rb => test/list_test.rb} (100%)
 rename Library/Homebrew/test/{test_log_formula.rb => test/log_formula_test.rb} (100%)
 rename Library/Homebrew/test/{test_log.rb => test/log_test.rb} (100%)
 rename Library/Homebrew/test/{test_migrate.rb => test/migrate_test.rb} (100%)
 rename Library/Homebrew/test/{test_migrator.rb => test/migrator_test.rb} (100%)
 rename Library/Homebrew/test/{test_missing.rb => test/missing_test.rb} (100%)
 rename Library/Homebrew/test/{test_mpi_requirement.rb => test/mpi_requirement_test.rb} (100%)
 rename Library/Homebrew/test/{test_options.rb => test/options_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_blacklist.rb => test/os/mac/blacklist_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_bottle_collector.rb => test/os/mac/bottle_collector_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_bottle_tag.rb => test/os/mac/bottle_tag_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_dependency_collector.rb => test/os/mac/dependency_collector_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_diagnostic.rb => test/os/mac/diagnostic_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_keg.rb => test/os/mac/keg_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_language.rb => test/os/mac/language_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_mach.rb => test/os/mac/mach_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_version.rb => test/os/mac/version_test.rb} (100%)
 rename Library/Homebrew/test/{test_os_mac_x11_requirement.rb => test/os/mac/x11_requirement_test.rb} (100%)
 rename Library/Homebrew/test/{test_outdated.rb => test/outdated_test.rb} (100%)
 rename Library/Homebrew/test/{test_patch.rb => test/patch_test.rb} (100%)
 rename Library/Homebrew/test/{test_patching.rb => test/patching_test.rb} (100%)
 rename Library/Homebrew/test/{test_pathname.rb => test/pathname_test.rb} (100%)
 rename Library/Homebrew/test/{test_pin_unpin.rb => test/pin_unpin_test.rb} (100%)
 rename Library/Homebrew/test/{test_pkg_version.rb => test/pkg_version_test.rb} (100%)
 rename Library/Homebrew/test/{test_prefix_formula.rb => test/prefix_formula_test.rb} (100%)
 rename Library/Homebrew/test/{test_prefix.rb => test/prefix_test.rb} (100%)
 rename Library/Homebrew/test/{test_prune.rb => test/prune_test.rb} (100%)
 rename Library/Homebrew/test/{test_pull_offline.rb => test/pull_offline_test.rb} (100%)
 rename Library/Homebrew/test/{test_pull.rb => test/pull_test.rb} (100%)
 rename Library/Homebrew/test/{test_readall.rb => test/readall_test.rb} (100%)
 rename Library/Homebrew/test/{test_reinstall_pinned.rb => test/reinstall_pinned_test.rb} (100%)
 rename Library/Homebrew/test/{test_reinstall.rb => test/reinstall_test.rb} (100%)
 rename Library/Homebrew/test/{test_repository.rb => test/repository_test.rb} (100%)
 rename Library/Homebrew/test/{test_requirement.rb => test/requirement_test.rb} (100%)
 rename Library/Homebrew/test/{test_resource.rb => test/resource_test.rb} (100%)
 rename Library/Homebrew/test/{test_sandbox.rb => test/sandbox_test.rb} (100%)
 rename Library/Homebrew/test/{test_search_remote_tap.rb => test/search_remote_tap_test.rb} (100%)
 rename Library/Homebrew/test/{test_search.rb => test/search_test.rb} (100%)
 rename Library/Homebrew/test/{test_services.rb => test/services_test.rb} (100%)
 rename Library/Homebrew/test/{test_sh.rb => test/sh_test.rb} (100%)
 rename Library/Homebrew/test/{test_shell.rb => test/shell_test.rb} (100%)
 rename Library/Homebrew/test/{test_software_spec.rb => test/software_spec_test.rb} (100%)
 rename Library/Homebrew/test/{test_stdlib.rb => test/stdlib_test.rb} (100%)
 rename Library/Homebrew/test/{test_string.rb => test/string_test.rb} (100%)
 rename Library/Homebrew/test/{test_switch.rb => test/switch_test.rb} (100%)
 rename Library/Homebrew/test/{test_tab.rb => test/tab_test.rb} (100%)
 rename Library/Homebrew/test/{test_tap_new.rb => test/tap_new_test.rb} (100%)
 rename Library/Homebrew/test/{test_tap.rb => test/tap_test.rb} (100%)
 rename Library/Homebrew/test/{test_test_formula.rb => test/test_formula_test.rb} (100%)
 rename Library/Homebrew/test/{test_uninstall.rb => test/uninstall_test.rb} (100%)
 rename Library/Homebrew/test/{test_unlink.rb => test/unlink_test.rb} (100%)
 rename Library/Homebrew/test/{test_unlinkapps.rb => test/unlinkapps_test.rb} (100%)
 rename Library/Homebrew/test/{test_unpack.rb => test/unpack_test.rb} (100%)
 rename Library/Homebrew/test/{test_update_report.rb => test/update_report_test.rb} (100%)
 rename Library/Homebrew/test/{test_upgrade.rb => test/upgrade_test.rb} (100%)
 rename Library/Homebrew/test/{test_uses.rb => test/uses_test.rb} (100%)
 create mode 100644 Library/Homebrew/test/test/utils/tty_test.rb
 rename Library/Homebrew/test/{test_utils.rb => test/utils_test.rb} (83%)
 rename Library/Homebrew/test/{test_version.rb => test/version_test.rb} (100%)
 rename Library/Homebrew/test/{test_versions.rb => test/versions_test.rb} (100%)
 rename Library/Homebrew/test/{test_x11_requirement.rb => test/x11_requirement_test.rb} (100%)

diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index ee7fa92757..df9a00a162 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -8,7 +8,7 @@ module Homebrew
   module_function
 
   def tests
-    (HOMEBREW_LIBRARY/"Homebrew").cd do
+    HOMEBREW_LIBRARY_PATH.cd do
       ENV.delete "HOMEBREW_VERBOSE"
       ENV.delete "VERBOSE"
       ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
@@ -44,8 +44,8 @@ module Homebrew
       # Make it easier to reproduce test runs.
       ENV["SEED"] = ARGV.next if ARGV.include? "--seed"
 
-      files = Dir["test/test_*.rb"]
-      files -= Dir["test/test_os_mac_*.rb"] unless OS.mac?
+      files = Dir.glob("test/test/**/*_test.rb")
+                 .reject { |p| !OS.mac? && p.start_with?("test/test/os/mac/") }
 
       opts = []
       opts << "--serialize-stdout" if ENV["CI"]
@@ -54,16 +54,14 @@ module Homebrew
       args << "--trace" if ARGV.include? "--trace"
 
       if ARGV.value("only")
-        ENV["HOMEBREW_TESTS_ONLY"] = "1"
-        test_name, test_method = ARGV.value("only").split("/", 2)
-        files = ["test/test_#{test_name}.rb"]
+        test_name, test_method = ARGV.value("only").split(":", 2)
+        files = Dir.glob("test/test/{#{test_name},#{test_name}/**/*}_test.rb")
         args << "--name=test_#{test_method}" if test_method
       end
 
       args += ARGV.named.select { |v| v[/^TEST(OPTS)?=/] }
 
-      system "bundle", "exec", "parallel_test", *opts,
-        "--", *args, "--", *files
+      system "bundle", "exec", "parallel_test", *opts, "--", *args, "--", *files
 
       Homebrew.failed = !$?.success?
 
diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test/ARGV_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_ARGV.rb
rename to Library/Homebrew/test/test/ARGV_test.rb
diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test/ENV_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_ENV.rb
rename to Library/Homebrew/test/test/ENV_test.rb
diff --git a/Library/Homebrew/test/test_analytics.rb b/Library/Homebrew/test/test/analytics_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_analytics.rb
rename to Library/Homebrew/test/test/analytics_test.rb
diff --git a/Library/Homebrew/test/test_audit.rb b/Library/Homebrew/test/test/audit_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_audit.rb
rename to Library/Homebrew/test/test/audit_test.rb
diff --git a/Library/Homebrew/test/test_bash.rb b/Library/Homebrew/test/test/bash_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_bash.rb
rename to Library/Homebrew/test/test/bash_test.rb
diff --git a/Library/Homebrew/test/test_blacklist.rb b/Library/Homebrew/test/test/blacklist_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_blacklist.rb
rename to Library/Homebrew/test/test/blacklist_test.rb
diff --git a/Library/Homebrew/test/test_bottle_collector.rb b/Library/Homebrew/test/test/bottle_collector_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_bottle_collector.rb
rename to Library/Homebrew/test/test/bottle_collector_test.rb
diff --git a/Library/Homebrew/test/test_bottle_filename.rb b/Library/Homebrew/test/test/bottle_filename_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_bottle_filename.rb
rename to Library/Homebrew/test/test/bottle_filename_test.rb
diff --git a/Library/Homebrew/test/test_bottle_hooks.rb b/Library/Homebrew/test/test/bottle_hooks_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_bottle_hooks.rb
rename to Library/Homebrew/test/test/bottle_hooks_test.rb
diff --git a/Library/Homebrew/test/test_bottle.rb b/Library/Homebrew/test/test/bottle_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_bottle.rb
rename to Library/Homebrew/test/test/bottle_test.rb
diff --git a/Library/Homebrew/test/test_build_environment.rb b/Library/Homebrew/test/test/build_environment_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_build_environment.rb
rename to Library/Homebrew/test/test/build_environment_test.rb
diff --git a/Library/Homebrew/test/test_build_options.rb b/Library/Homebrew/test/test/build_options_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_build_options.rb
rename to Library/Homebrew/test/test/build_options_test.rb
diff --git a/Library/Homebrew/test/test_bundle.rb b/Library/Homebrew/test/test/bundle_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_bundle.rb
rename to Library/Homebrew/test/test/bundle_test.rb
diff --git a/Library/Homebrew/test/test_cache_formula.rb b/Library/Homebrew/test/test/cache_formula_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cache_formula.rb
rename to Library/Homebrew/test/test/cache_formula_test.rb
diff --git a/Library/Homebrew/test/test_cache.rb b/Library/Homebrew/test/test/cache_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cache.rb
rename to Library/Homebrew/test/test/cache_test.rb
diff --git a/Library/Homebrew/test/test_cask.rb b/Library/Homebrew/test/test/cask_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cask.rb
rename to Library/Homebrew/test/test/cask_test.rb
diff --git a/Library/Homebrew/test/test_cat.rb b/Library/Homebrew/test/test/cat_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cat.rb
rename to Library/Homebrew/test/test/cat_test.rb
diff --git a/Library/Homebrew/test/test_caveats.rb b/Library/Homebrew/test/test/caveats_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_caveats.rb
rename to Library/Homebrew/test/test/caveats_test.rb
diff --git a/Library/Homebrew/test/test_cellar_formula.rb b/Library/Homebrew/test/test/cellar_formula_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cellar_formula.rb
rename to Library/Homebrew/test/test/cellar_formula_test.rb
diff --git a/Library/Homebrew/test/test_cellar.rb b/Library/Homebrew/test/test/cellar_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cellar.rb
rename to Library/Homebrew/test/test/cellar_test.rb
diff --git a/Library/Homebrew/test/test_checksum.rb b/Library/Homebrew/test/test/checksum_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_checksum.rb
rename to Library/Homebrew/test/test/checksum_test.rb
diff --git a/Library/Homebrew/test/test_checksum_verification.rb b/Library/Homebrew/test/test/checksum_verification_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_checksum_verification.rb
rename to Library/Homebrew/test/test/checksum_verification_test.rb
diff --git a/Library/Homebrew/test/test_cleaner.rb b/Library/Homebrew/test/test/cleaner_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cleaner.rb
rename to Library/Homebrew/test/test/cleaner_test.rb
diff --git a/Library/Homebrew/test/test_cleanup.rb b/Library/Homebrew/test/test/cleanup_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_cleanup.rb
rename to Library/Homebrew/test/test/cleanup_test.rb
diff --git a/Library/Homebrew/test/test_command.rb b/Library/Homebrew/test/test/command_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_command.rb
rename to Library/Homebrew/test/test/command_test.rb
diff --git a/Library/Homebrew/test/test_commands.rb b/Library/Homebrew/test/test/commands_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_commands.rb
rename to Library/Homebrew/test/test/commands_test.rb
diff --git a/Library/Homebrew/test/test_compiler_failure.rb b/Library/Homebrew/test/test/compiler_failure_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_compiler_failure.rb
rename to Library/Homebrew/test/test/compiler_failure_test.rb
diff --git a/Library/Homebrew/test/test_compiler_selector.rb b/Library/Homebrew/test/test/compiler_selector_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_compiler_selector.rb
rename to Library/Homebrew/test/test/compiler_selector_test.rb
diff --git a/Library/Homebrew/test/test_config.rb b/Library/Homebrew/test/test/config_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_config.rb
rename to Library/Homebrew/test/test/config_test.rb
diff --git a/Library/Homebrew/test/test_create.rb b/Library/Homebrew/test/test/create_test.rb
similarity index 83%
rename from Library/Homebrew/test/test_create.rb
rename to Library/Homebrew/test/test/create_test.rb
index bb1a2cd2af..5f194ea023 100644
--- a/Library/Homebrew/test/test_create.rb
+++ b/Library/Homebrew/test/test/create_test.rb
@@ -2,7 +2,7 @@ require "helper/integration_command_test_case"
 
 class IntegrationCommandTestCreate < IntegrationCommandTestCase
   def test_create
-    url = "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz"
+    url = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz"
     cmd("create", url, "HOMEBREW_EDITOR" => "/bin/cat")
 
     formula_file = CoreTap.new.formula_dir/"testball.rb"
diff --git a/Library/Homebrew/test/test_custom_command.rb b/Library/Homebrew/test/test/custom_command_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_custom_command.rb
rename to Library/Homebrew/test/test/custom_command_test.rb
diff --git a/Library/Homebrew/test/test_dependencies.rb b/Library/Homebrew/test/test/dependencies_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_dependencies.rb
rename to Library/Homebrew/test/test/dependencies_test.rb
diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test/dependency_collector_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_dependency_collector.rb
rename to Library/Homebrew/test/test/dependency_collector_test.rb
diff --git a/Library/Homebrew/test/test_dependency_expansion.rb b/Library/Homebrew/test/test/dependency_expansion_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_dependency_expansion.rb
rename to Library/Homebrew/test/test/dependency_expansion_test.rb
diff --git a/Library/Homebrew/test/test_dependency.rb b/Library/Homebrew/test/test/dependency_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_dependency.rb
rename to Library/Homebrew/test/test/dependency_test.rb
diff --git a/Library/Homebrew/test/test_deps.rb b/Library/Homebrew/test/test/deps_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_deps.rb
rename to Library/Homebrew/test/test/deps_test.rb
diff --git a/Library/Homebrew/test/test_desc.rb b/Library/Homebrew/test/test/desc_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_desc.rb
rename to Library/Homebrew/test/test/desc_test.rb
diff --git a/Library/Homebrew/test/test_descriptions.rb b/Library/Homebrew/test/test/descriptions_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_descriptions.rb
rename to Library/Homebrew/test/test/descriptions_test.rb
diff --git a/Library/Homebrew/test/test_diagnostic.rb b/Library/Homebrew/test/test/diagnostic_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_diagnostic.rb
rename to Library/Homebrew/test/test/diagnostic_test.rb
diff --git a/Library/Homebrew/test/test_doctor.rb b/Library/Homebrew/test/test/doctor_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_doctor.rb
rename to Library/Homebrew/test/test/doctor_test.rb
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test/download_strategies_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_download_strategies.rb
rename to Library/Homebrew/test/test/download_strategies_test.rb
diff --git a/Library/Homebrew/test/test_edit.rb b/Library/Homebrew/test/test/edit_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_edit.rb
rename to Library/Homebrew/test/test/edit_test.rb
diff --git a/Library/Homebrew/test/test_exceptions.rb b/Library/Homebrew/test/test/exceptions_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_exceptions.rb
rename to Library/Homebrew/test/test/exceptions_test.rb
diff --git a/Library/Homebrew/test/test_fetch.rb b/Library/Homebrew/test/test/fetch_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_fetch.rb
rename to Library/Homebrew/test/test/fetch_test.rb
diff --git a/Library/Homebrew/test/test_formula_installer_bottle.rb b/Library/Homebrew/test/test/formula_installer_bottle_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_installer_bottle.rb
rename to Library/Homebrew/test/test/formula_installer_bottle_test.rb
diff --git a/Library/Homebrew/test/test_formula_installer.rb b/Library/Homebrew/test/test/formula_installer_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_installer.rb
rename to Library/Homebrew/test/test/formula_installer_test.rb
diff --git a/Library/Homebrew/test/test_formula_lock.rb b/Library/Homebrew/test/test/formula_lock_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_lock.rb
rename to Library/Homebrew/test/test/formula_lock_test.rb
diff --git a/Library/Homebrew/test/test_formula_pin.rb b/Library/Homebrew/test/test/formula_pin_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_pin.rb
rename to Library/Homebrew/test/test/formula_pin_test.rb
diff --git a/Library/Homebrew/test/test_formula_spec_selection.rb b/Library/Homebrew/test/test/formula_spec_selection_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_spec_selection.rb
rename to Library/Homebrew/test/test/formula_spec_selection_test.rb
diff --git a/Library/Homebrew/test/test_formula_support.rb b/Library/Homebrew/test/test/formula_support_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_support.rb
rename to Library/Homebrew/test/test/formula_support_test.rb
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test/formula_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula.rb
rename to Library/Homebrew/test/test/formula_test.rb
diff --git a/Library/Homebrew/test/test_formula_validation.rb b/Library/Homebrew/test/test/formula_validation_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_formula_validation.rb
rename to Library/Homebrew/test/test/formula_validation_test.rb
diff --git a/Library/Homebrew/test/test_formulary.rb b/Library/Homebrew/test/test/formulary_test.rb
similarity index 98%
rename from Library/Homebrew/test/test_formulary.rb
rename to Library/Homebrew/test/test/formulary_test.rb
index c545ff84da..690ff089a7 100644
--- a/Library/Homebrew/test/test_formulary.rb
+++ b/Library/Homebrew/test/test/formulary_test.rb
@@ -18,7 +18,7 @@ class FormularyFactoryTest < Homebrew::TestCase
   def setup
     @name = "testball_bottle"
     @path = CoreTap.new.formula_dir/"#{@name}.rb"
-    @bottle_dir = Pathname.new("#{File.expand_path("..", __FILE__)}/bottles")
+    @bottle_dir = Pathname.new("#{TEST_DIRECTORY}/bottles")
     @bottle = @bottle_dir/"testball_bottle-0.1.#{Utils::Bottles.tag}.bottle.tar.gz"
     @path.write <<-EOS.undent
       class #{Formulary.class_s(@name)} < Formula
diff --git a/Library/Homebrew/test/test_gpg2_requirement.rb b/Library/Homebrew/test/test/gpg2_requirement_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_gpg2_requirement.rb
rename to Library/Homebrew/test/test/gpg2_requirement_test.rb
diff --git a/Library/Homebrew/test/test_gpg.rb b/Library/Homebrew/test/test/gpg_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_gpg.rb
rename to Library/Homebrew/test/test/gpg_test.rb
diff --git a/Library/Homebrew/test/test_hardware.rb b/Library/Homebrew/test/test/hardware_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_hardware.rb
rename to Library/Homebrew/test/test/hardware_test.rb
diff --git a/Library/Homebrew/test/test_help.rb b/Library/Homebrew/test/test/help_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_help.rb
rename to Library/Homebrew/test/test/help_test.rb
diff --git a/Library/Homebrew/test/test_home.rb b/Library/Homebrew/test/test/home_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_home.rb
rename to Library/Homebrew/test/test/home_test.rb
diff --git a/Library/Homebrew/test/test_info.rb b/Library/Homebrew/test/test/info_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_info.rb
rename to Library/Homebrew/test/test/info_test.rb
diff --git a/Library/Homebrew/test/test_inreplace.rb b/Library/Homebrew/test/test/inreplace_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_inreplace.rb
rename to Library/Homebrew/test/test/inreplace_test.rb
diff --git a/Library/Homebrew/test/test_install.rb b/Library/Homebrew/test/test/install_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_install.rb
rename to Library/Homebrew/test/test/install_test.rb
diff --git a/Library/Homebrew/test/test_irb.rb b/Library/Homebrew/test/test/irb_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_irb.rb
rename to Library/Homebrew/test/test/irb_test.rb
diff --git a/Library/Homebrew/test/test_json.rb b/Library/Homebrew/test/test/json_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_json.rb
rename to Library/Homebrew/test/test/json_test.rb
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test/keg_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_keg.rb
rename to Library/Homebrew/test/test/keg_test.rb
diff --git a/Library/Homebrew/test/test_language_go.rb b/Library/Homebrew/test/test/language_go_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_language_go.rb
rename to Library/Homebrew/test/test/language_go_test.rb
diff --git a/Library/Homebrew/test/test_language_module_requirement.rb b/Library/Homebrew/test/test/language_module_requirement_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_language_module_requirement.rb
rename to Library/Homebrew/test/test/language_module_requirement_test.rb
diff --git a/Library/Homebrew/test/test_language_python.rb b/Library/Homebrew/test/test/language_python_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_language_python.rb
rename to Library/Homebrew/test/test/language_python_test.rb
diff --git a/Library/Homebrew/test/test_leaves.rb b/Library/Homebrew/test/test/leaves_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_leaves.rb
rename to Library/Homebrew/test/test/leaves_test.rb
diff --git a/Library/Homebrew/test/test_link.rb b/Library/Homebrew/test/test/link_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_link.rb
rename to Library/Homebrew/test/test/link_test.rb
diff --git a/Library/Homebrew/test/test_linkapps.rb b/Library/Homebrew/test/test/linkapps_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_linkapps.rb
rename to Library/Homebrew/test/test/linkapps_test.rb
diff --git a/Library/Homebrew/test/test_list.rb b/Library/Homebrew/test/test/list_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_list.rb
rename to Library/Homebrew/test/test/list_test.rb
diff --git a/Library/Homebrew/test/test_log_formula.rb b/Library/Homebrew/test/test/log_formula_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_log_formula.rb
rename to Library/Homebrew/test/test/log_formula_test.rb
diff --git a/Library/Homebrew/test/test_log.rb b/Library/Homebrew/test/test/log_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_log.rb
rename to Library/Homebrew/test/test/log_test.rb
diff --git a/Library/Homebrew/test/test_migrate.rb b/Library/Homebrew/test/test/migrate_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_migrate.rb
rename to Library/Homebrew/test/test/migrate_test.rb
diff --git a/Library/Homebrew/test/test_migrator.rb b/Library/Homebrew/test/test/migrator_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_migrator.rb
rename to Library/Homebrew/test/test/migrator_test.rb
diff --git a/Library/Homebrew/test/test_missing.rb b/Library/Homebrew/test/test/missing_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_missing.rb
rename to Library/Homebrew/test/test/missing_test.rb
diff --git a/Library/Homebrew/test/test_mpi_requirement.rb b/Library/Homebrew/test/test/mpi_requirement_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_mpi_requirement.rb
rename to Library/Homebrew/test/test/mpi_requirement_test.rb
diff --git a/Library/Homebrew/test/test_options.rb b/Library/Homebrew/test/test/options_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_options.rb
rename to Library/Homebrew/test/test/options_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_blacklist.rb b/Library/Homebrew/test/test/os/mac/blacklist_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_blacklist.rb
rename to Library/Homebrew/test/test/os/mac/blacklist_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_bottle_collector.rb b/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_bottle_collector.rb
rename to Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_bottle_tag.rb b/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_bottle_tag.rb
rename to Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_dependency_collector.rb b/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_dependency_collector.rb
rename to Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_diagnostic.rb b/Library/Homebrew/test/test/os/mac/diagnostic_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_diagnostic.rb
rename to Library/Homebrew/test/test/os/mac/diagnostic_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_keg.rb b/Library/Homebrew/test/test/os/mac/keg_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_keg.rb
rename to Library/Homebrew/test/test/os/mac/keg_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_language.rb b/Library/Homebrew/test/test/os/mac/language_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_language.rb
rename to Library/Homebrew/test/test/os/mac/language_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_mach.rb b/Library/Homebrew/test/test/os/mac/mach_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_mach.rb
rename to Library/Homebrew/test/test/os/mac/mach_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_version.rb b/Library/Homebrew/test/test/os/mac/version_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_version.rb
rename to Library/Homebrew/test/test/os/mac/version_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_x11_requirement.rb b/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_os_mac_x11_requirement.rb
rename to Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
diff --git a/Library/Homebrew/test/test_outdated.rb b/Library/Homebrew/test/test/outdated_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_outdated.rb
rename to Library/Homebrew/test/test/outdated_test.rb
diff --git a/Library/Homebrew/test/test_patch.rb b/Library/Homebrew/test/test/patch_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_patch.rb
rename to Library/Homebrew/test/test/patch_test.rb
diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test/patching_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_patching.rb
rename to Library/Homebrew/test/test/patching_test.rb
diff --git a/Library/Homebrew/test/test_pathname.rb b/Library/Homebrew/test/test/pathname_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_pathname.rb
rename to Library/Homebrew/test/test/pathname_test.rb
diff --git a/Library/Homebrew/test/test_pin_unpin.rb b/Library/Homebrew/test/test/pin_unpin_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_pin_unpin.rb
rename to Library/Homebrew/test/test/pin_unpin_test.rb
diff --git a/Library/Homebrew/test/test_pkg_version.rb b/Library/Homebrew/test/test/pkg_version_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_pkg_version.rb
rename to Library/Homebrew/test/test/pkg_version_test.rb
diff --git a/Library/Homebrew/test/test_prefix_formula.rb b/Library/Homebrew/test/test/prefix_formula_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_prefix_formula.rb
rename to Library/Homebrew/test/test/prefix_formula_test.rb
diff --git a/Library/Homebrew/test/test_prefix.rb b/Library/Homebrew/test/test/prefix_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_prefix.rb
rename to Library/Homebrew/test/test/prefix_test.rb
diff --git a/Library/Homebrew/test/test_prune.rb b/Library/Homebrew/test/test/prune_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_prune.rb
rename to Library/Homebrew/test/test/prune_test.rb
diff --git a/Library/Homebrew/test/test_pull_offline.rb b/Library/Homebrew/test/test/pull_offline_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_pull_offline.rb
rename to Library/Homebrew/test/test/pull_offline_test.rb
diff --git a/Library/Homebrew/test/test_pull.rb b/Library/Homebrew/test/test/pull_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_pull.rb
rename to Library/Homebrew/test/test/pull_test.rb
diff --git a/Library/Homebrew/test/test_readall.rb b/Library/Homebrew/test/test/readall_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_readall.rb
rename to Library/Homebrew/test/test/readall_test.rb
diff --git a/Library/Homebrew/test/test_reinstall_pinned.rb b/Library/Homebrew/test/test/reinstall_pinned_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_reinstall_pinned.rb
rename to Library/Homebrew/test/test/reinstall_pinned_test.rb
diff --git a/Library/Homebrew/test/test_reinstall.rb b/Library/Homebrew/test/test/reinstall_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_reinstall.rb
rename to Library/Homebrew/test/test/reinstall_test.rb
diff --git a/Library/Homebrew/test/test_repository.rb b/Library/Homebrew/test/test/repository_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_repository.rb
rename to Library/Homebrew/test/test/repository_test.rb
diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test/requirement_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_requirement.rb
rename to Library/Homebrew/test/test/requirement_test.rb
diff --git a/Library/Homebrew/test/test_resource.rb b/Library/Homebrew/test/test/resource_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_resource.rb
rename to Library/Homebrew/test/test/resource_test.rb
diff --git a/Library/Homebrew/test/test_sandbox.rb b/Library/Homebrew/test/test/sandbox_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_sandbox.rb
rename to Library/Homebrew/test/test/sandbox_test.rb
diff --git a/Library/Homebrew/test/test_search_remote_tap.rb b/Library/Homebrew/test/test/search_remote_tap_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_search_remote_tap.rb
rename to Library/Homebrew/test/test/search_remote_tap_test.rb
diff --git a/Library/Homebrew/test/test_search.rb b/Library/Homebrew/test/test/search_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_search.rb
rename to Library/Homebrew/test/test/search_test.rb
diff --git a/Library/Homebrew/test/test_services.rb b/Library/Homebrew/test/test/services_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_services.rb
rename to Library/Homebrew/test/test/services_test.rb
diff --git a/Library/Homebrew/test/test_sh.rb b/Library/Homebrew/test/test/sh_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_sh.rb
rename to Library/Homebrew/test/test/sh_test.rb
diff --git a/Library/Homebrew/test/test_shell.rb b/Library/Homebrew/test/test/shell_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_shell.rb
rename to Library/Homebrew/test/test/shell_test.rb
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test/software_spec_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_software_spec.rb
rename to Library/Homebrew/test/test/software_spec_test.rb
diff --git a/Library/Homebrew/test/test_stdlib.rb b/Library/Homebrew/test/test/stdlib_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_stdlib.rb
rename to Library/Homebrew/test/test/stdlib_test.rb
diff --git a/Library/Homebrew/test/test_string.rb b/Library/Homebrew/test/test/string_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_string.rb
rename to Library/Homebrew/test/test/string_test.rb
diff --git a/Library/Homebrew/test/test_switch.rb b/Library/Homebrew/test/test/switch_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_switch.rb
rename to Library/Homebrew/test/test/switch_test.rb
diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test/tab_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_tab.rb
rename to Library/Homebrew/test/test/tab_test.rb
diff --git a/Library/Homebrew/test/test_tap_new.rb b/Library/Homebrew/test/test/tap_new_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_tap_new.rb
rename to Library/Homebrew/test/test/tap_new_test.rb
diff --git a/Library/Homebrew/test/test_tap.rb b/Library/Homebrew/test/test/tap_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_tap.rb
rename to Library/Homebrew/test/test/tap_test.rb
diff --git a/Library/Homebrew/test/test_test_formula.rb b/Library/Homebrew/test/test/test_formula_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_test_formula.rb
rename to Library/Homebrew/test/test/test_formula_test.rb
diff --git a/Library/Homebrew/test/test_uninstall.rb b/Library/Homebrew/test/test/uninstall_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_uninstall.rb
rename to Library/Homebrew/test/test/uninstall_test.rb
diff --git a/Library/Homebrew/test/test_unlink.rb b/Library/Homebrew/test/test/unlink_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_unlink.rb
rename to Library/Homebrew/test/test/unlink_test.rb
diff --git a/Library/Homebrew/test/test_unlinkapps.rb b/Library/Homebrew/test/test/unlinkapps_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_unlinkapps.rb
rename to Library/Homebrew/test/test/unlinkapps_test.rb
diff --git a/Library/Homebrew/test/test_unpack.rb b/Library/Homebrew/test/test/unpack_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_unpack.rb
rename to Library/Homebrew/test/test/unpack_test.rb
diff --git a/Library/Homebrew/test/test_update_report.rb b/Library/Homebrew/test/test/update_report_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_update_report.rb
rename to Library/Homebrew/test/test/update_report_test.rb
diff --git a/Library/Homebrew/test/test_upgrade.rb b/Library/Homebrew/test/test/upgrade_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_upgrade.rb
rename to Library/Homebrew/test/test/upgrade_test.rb
diff --git a/Library/Homebrew/test/test_uses.rb b/Library/Homebrew/test/test/uses_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_uses.rb
rename to Library/Homebrew/test/test/uses_test.rb
diff --git a/Library/Homebrew/test/test/utils/tty_test.rb b/Library/Homebrew/test/test/utils/tty_test.rb
new file mode 100644
index 0000000000..09f092cbdc
--- /dev/null
+++ b/Library/Homebrew/test/test/utils/tty_test.rb
@@ -0,0 +1,46 @@
+require "testing_env"
+require "utils"
+
+class TtyTests < Homebrew::TestCase
+  def test_strip_ansi
+    assert_equal "hello", Tty.strip_ansi("\033\[36;7mhello\033\[0m")
+  end
+
+  def test_width
+    assert_kind_of Integer, Tty.width
+  end
+
+  def test_truncate
+    Tty.stubs(:width).returns 15
+    assert_equal "foobar some", Tty.truncate("foobar something very long")
+    assert_equal "truncate", Tty.truncate("truncate")
+
+    # When the terminal is unsupported, we report 0 width
+    Tty.stubs(:width).returns 0
+    assert_equal "foobar something very long", Tty.truncate("foobar something very long")
+  end
+
+  def test_no_tty_formatting
+    $stdout.stubs(:tty?).returns false
+    assert_equal "", Tty.to_s
+    assert_equal "", Tty.red.to_s
+    assert_equal "", Tty.green.to_s
+    assert_equal "", Tty.yellow.to_s
+    assert_equal "", Tty.blue.to_s
+    assert_equal "", Tty.magenta.to_s
+    assert_equal "", Tty.cyan.to_s
+    assert_equal "", Tty.default.to_s
+  end
+
+  def test_formatting
+    $stdout.stubs(:tty?).returns(true)
+    assert_equal "",         Tty.to_s
+    assert_equal "\033[31m", Tty.red.to_s
+    assert_equal "\033[32m", Tty.green.to_s
+    assert_equal "\033[33m", Tty.yellow.to_s
+    assert_equal "\033[34m", Tty.blue.to_s
+    assert_equal "\033[35m", Tty.magenta.to_s
+    assert_equal "\033[36m", Tty.cyan.to_s
+    assert_equal "\033[39m", Tty.default.to_s
+  end
+end
diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test/utils_test.rb
similarity index 83%
rename from Library/Homebrew/test/test_utils.rb
rename to Library/Homebrew/test/test/utils_test.rb
index 7c0b6f78a1..146f57b495 100644
--- a/Library/Homebrew/test/test_utils.rb
+++ b/Library/Homebrew/test/test/utils_test.rb
@@ -3,50 +3,6 @@ require "utils"
 require "tempfile"
 require "utils/shell"
 
-class TtyTests < Homebrew::TestCase
-  def test_strip_ansi
-    assert_equal "hello", Tty.strip_ansi("\033\[36;7mhello\033\[0m")
-  end
-
-  def test_width
-    assert_kind_of Integer, Tty.width
-  end
-
-  def test_truncate
-    Tty.stubs(:width).returns 15
-    assert_equal "foobar some", Tty.truncate("foobar something very long")
-    assert_equal "truncate", Tty.truncate("truncate")
-
-    # When the terminal is unsupported, we report 0 width
-    Tty.stubs(:width).returns 0
-    assert_equal "foobar something very long", Tty.truncate("foobar something very long")
-  end
-
-  def test_no_tty_formatting
-    $stdout.stubs(:tty?).returns false
-    assert_equal "", Tty.to_s
-    assert_equal "", Tty.red.to_s
-    assert_equal "", Tty.green.to_s
-    assert_equal "", Tty.yellow.to_s
-    assert_equal "", Tty.blue.to_s
-    assert_equal "", Tty.magenta.to_s
-    assert_equal "", Tty.cyan.to_s
-    assert_equal "", Tty.default.to_s
-  end
-
-  def test_formatting
-    $stdout.stubs(:tty?).returns(true)
-    assert_equal "",         Tty.to_s
-    assert_equal "\033[31m", Tty.red.to_s
-    assert_equal "\033[32m", Tty.green.to_s
-    assert_equal "\033[33m", Tty.yellow.to_s
-    assert_equal "\033[34m", Tty.blue.to_s
-    assert_equal "\033[35m", Tty.magenta.to_s
-    assert_equal "\033[36m", Tty.cyan.to_s
-    assert_equal "\033[39m", Tty.default.to_s
-  end
-end
-
 class UtilTests < Homebrew::TestCase
   def setup
     @dir = Pathname.new(mktmpdir)
diff --git a/Library/Homebrew/test/test_version.rb b/Library/Homebrew/test/test/version_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_version.rb
rename to Library/Homebrew/test/test/version_test.rb
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test/versions_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_versions.rb
rename to Library/Homebrew/test/test/versions_test.rb
diff --git a/Library/Homebrew/test/test_x11_requirement.rb b/Library/Homebrew/test/test/x11_requirement_test.rb
similarity index 100%
rename from Library/Homebrew/test/test_x11_requirement.rb
rename to Library/Homebrew/test/test/x11_requirement_test.rb