From 7457af2b231528e1287281f6cfe651600d5f3f5d Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 13 Nov 2016 22:00:15 +0100 Subject: [PATCH] Move test files back directly to `test/`. --- Library/Homebrew/dev-cmd/tests.rb | 6 +++--- Library/Homebrew/test/{test => }/ARGV_test.rb | 0 Library/Homebrew/test/{test => }/ENV_test.rb | 0 Library/Homebrew/test/{test => }/analytics_test.rb | 0 Library/Homebrew/test/{test => }/audit_test.rb | 0 Library/Homebrew/test/{test => }/bash_test.rb | 0 Library/Homebrew/test/{test => }/blacklist_test.rb | 0 Library/Homebrew/test/{test => }/bottle_collector_test.rb | 0 Library/Homebrew/test/{test => }/bottle_filename_test.rb | 0 Library/Homebrew/test/{test => }/bottle_hooks_test.rb | 0 Library/Homebrew/test/{test => }/bottle_test.rb | 0 Library/Homebrew/test/{test => }/build_environment_test.rb | 0 Library/Homebrew/test/{test => }/build_options_test.rb | 0 Library/Homebrew/test/{test => }/bundle_test.rb | 0 Library/Homebrew/test/{test => }/cache_formula_test.rb | 0 Library/Homebrew/test/{test => }/cache_test.rb | 0 Library/Homebrew/test/{test => }/cask_test.rb | 0 Library/Homebrew/test/{test => }/cat_test.rb | 0 Library/Homebrew/test/{test => }/caveats_test.rb | 0 Library/Homebrew/test/{test => }/cellar_formula_test.rb | 0 Library/Homebrew/test/{test => }/cellar_test.rb | 0 Library/Homebrew/test/{test => }/checksum_test.rb | 0 .../Homebrew/test/{test => }/checksum_verification_test.rb | 0 Library/Homebrew/test/{test => }/cleaner_test.rb | 0 Library/Homebrew/test/{test => }/cleanup_test.rb | 0 Library/Homebrew/test/{test => }/command_test.rb | 0 Library/Homebrew/test/{test => }/commands_test.rb | 0 Library/Homebrew/test/{test => }/compiler_failure_test.rb | 0 Library/Homebrew/test/{test => }/compiler_selector_test.rb | 0 Library/Homebrew/test/{test => }/config_test.rb | 0 Library/Homebrew/test/{test => }/create_test.rb | 0 Library/Homebrew/test/{test => }/custom_command_test.rb | 0 Library/Homebrew/test/{test => }/dependencies_test.rb | 0 .../Homebrew/test/{test => }/dependency_collector_test.rb | 0 .../Homebrew/test/{test => }/dependency_expansion_test.rb | 0 Library/Homebrew/test/{test => }/dependency_test.rb | 0 Library/Homebrew/test/{test => }/deps_test.rb | 0 Library/Homebrew/test/{test => }/desc_test.rb | 0 Library/Homebrew/test/{test => }/descriptions_test.rb | 0 Library/Homebrew/test/{test => }/diagnostic_test.rb | 0 Library/Homebrew/test/{test => }/doctor_test.rb | 0 .../Homebrew/test/{test => }/download_strategies_test.rb | 0 Library/Homebrew/test/{test => }/edit_test.rb | 0 Library/Homebrew/test/{test => }/exceptions_test.rb | 0 Library/Homebrew/test/{test => }/fetch_test.rb | 0 .../test/{test => }/formula_installer_bottle_test.rb | 0 Library/Homebrew/test/{test => }/formula_installer_test.rb | 0 Library/Homebrew/test/{test => }/formula_lock_test.rb | 0 Library/Homebrew/test/{test => }/formula_pin_test.rb | 0 .../Homebrew/test/{test => }/formula_spec_selection_test.rb | 0 Library/Homebrew/test/{test => }/formula_support_test.rb | 0 Library/Homebrew/test/{test => }/formula_test.rb | 0 Library/Homebrew/test/{test => }/formula_validation_test.rb | 0 Library/Homebrew/test/{test => }/formulary_test.rb | 0 Library/Homebrew/test/{test => }/gpg2_requirement_test.rb | 0 Library/Homebrew/test/{test => }/gpg_test.rb | 0 Library/Homebrew/test/{test => }/hardware_test.rb | 0 Library/Homebrew/test/{test => }/help_test.rb | 0 Library/Homebrew/test/{test => }/home_test.rb | 0 Library/Homebrew/test/{test => }/info_test.rb | 0 Library/Homebrew/test/{test => }/inreplace_test.rb | 0 Library/Homebrew/test/{test => }/install_test.rb | 0 Library/Homebrew/test/{test => }/irb_test.rb | 0 Library/Homebrew/test/{test => }/json_test.rb | 0 Library/Homebrew/test/{test => }/keg_test.rb | 0 Library/Homebrew/test/{test => }/language_go_test.rb | 0 .../test/{test => }/language_module_requirement_test.rb | 0 Library/Homebrew/test/{test => }/language_python_test.rb | 0 Library/Homebrew/test/{test => }/leaves_test.rb | 0 Library/Homebrew/test/{test => }/link_test.rb | 0 Library/Homebrew/test/{test => }/linkapps_test.rb | 0 Library/Homebrew/test/{test => }/list_test.rb | 0 Library/Homebrew/test/{test => }/log_formula_test.rb | 0 Library/Homebrew/test/{test => }/log_test.rb | 0 Library/Homebrew/test/{test => }/migrate_test.rb | 0 Library/Homebrew/test/{test => }/migrator_test.rb | 0 Library/Homebrew/test/{test => }/missing_test.rb | 0 Library/Homebrew/test/{test => }/mpi_requirement_test.rb | 0 Library/Homebrew/test/{test => }/options_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/blacklist_test.rb | 0 .../test/{test => }/os/mac/bottle_collector_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/bottle_tag_test.rb | 0 .../test/{test => }/os/mac/dependency_collector_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/diagnostic_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/keg_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/language_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/mach_test.rb | 0 Library/Homebrew/test/{test => }/os/mac/version_test.rb | 0 .../Homebrew/test/{test => }/os/mac/x11_requirement_test.rb | 0 Library/Homebrew/test/{test => }/outdated_test.rb | 0 Library/Homebrew/test/{test => }/patch_test.rb | 0 Library/Homebrew/test/{test => }/patching_test.rb | 0 Library/Homebrew/test/{test => }/pathname_test.rb | 0 Library/Homebrew/test/{test => }/pin_unpin_test.rb | 0 Library/Homebrew/test/{test => }/pkg_version_test.rb | 0 Library/Homebrew/test/{test => }/prefix_formula_test.rb | 0 Library/Homebrew/test/{test => }/prefix_test.rb | 0 Library/Homebrew/test/{test => }/prune_test.rb | 0 Library/Homebrew/test/{test => }/pull_offline_test.rb | 0 Library/Homebrew/test/{test => }/pull_test.rb | 0 Library/Homebrew/test/{test => }/readall_test.rb | 0 Library/Homebrew/test/{test => }/reinstall_pinned_test.rb | 0 Library/Homebrew/test/{test => }/reinstall_test.rb | 0 Library/Homebrew/test/{test => }/repository_test.rb | 0 Library/Homebrew/test/{test => }/requirement_test.rb | 0 Library/Homebrew/test/{test => }/resource_test.rb | 0 Library/Homebrew/test/{test => }/sandbox_test.rb | 0 Library/Homebrew/test/{test => }/search_remote_tap_test.rb | 0 Library/Homebrew/test/{test => }/search_test.rb | 0 Library/Homebrew/test/{test => }/services_test.rb | 0 Library/Homebrew/test/{test => }/sh_test.rb | 0 Library/Homebrew/test/{test => }/shell_test.rb | 0 Library/Homebrew/test/{test => }/software_spec_test.rb | 0 Library/Homebrew/test/{test => }/stdlib_test.rb | 0 Library/Homebrew/test/{test => }/string_test.rb | 0 Library/Homebrew/test/{test => }/switch_test.rb | 0 Library/Homebrew/test/{test => }/tab_test.rb | 0 Library/Homebrew/test/{test => }/tap_new_test.rb | 0 Library/Homebrew/test/{test => }/tap_test.rb | 0 Library/Homebrew/test/{test => }/test_formula_test.rb | 0 Library/Homebrew/test/{test => }/uninstall_test.rb | 0 Library/Homebrew/test/{test => }/unlink_test.rb | 0 Library/Homebrew/test/{test => }/unlinkapps_test.rb | 0 Library/Homebrew/test/{test => }/unpack_test.rb | 0 Library/Homebrew/test/{test => }/update_report_test.rb | 0 Library/Homebrew/test/{test => }/upgrade_test.rb | 0 Library/Homebrew/test/{test => }/uses_test.rb | 0 Library/Homebrew/test/{test => }/utils/tty_test.rb | 0 Library/Homebrew/test/{test => }/utils_test.rb | 0 Library/Homebrew/test/{test => }/version_test.rb | 0 Library/Homebrew/test/{test => }/versions_test.rb | 0 Library/Homebrew/test/{test => }/x11_requirement_test.rb | 0 132 files changed, 3 insertions(+), 3 deletions(-) rename Library/Homebrew/test/{test => }/ARGV_test.rb (100%) rename Library/Homebrew/test/{test => }/ENV_test.rb (100%) rename Library/Homebrew/test/{test => }/analytics_test.rb (100%) rename Library/Homebrew/test/{test => }/audit_test.rb (100%) rename Library/Homebrew/test/{test => }/bash_test.rb (100%) rename Library/Homebrew/test/{test => }/blacklist_test.rb (100%) rename Library/Homebrew/test/{test => }/bottle_collector_test.rb (100%) rename Library/Homebrew/test/{test => }/bottle_filename_test.rb (100%) rename Library/Homebrew/test/{test => }/bottle_hooks_test.rb (100%) rename Library/Homebrew/test/{test => }/bottle_test.rb (100%) rename Library/Homebrew/test/{test => }/build_environment_test.rb (100%) rename Library/Homebrew/test/{test => }/build_options_test.rb (100%) rename Library/Homebrew/test/{test => }/bundle_test.rb (100%) rename Library/Homebrew/test/{test => }/cache_formula_test.rb (100%) rename Library/Homebrew/test/{test => }/cache_test.rb (100%) rename Library/Homebrew/test/{test => }/cask_test.rb (100%) rename Library/Homebrew/test/{test => }/cat_test.rb (100%) rename Library/Homebrew/test/{test => }/caveats_test.rb (100%) rename Library/Homebrew/test/{test => }/cellar_formula_test.rb (100%) rename Library/Homebrew/test/{test => }/cellar_test.rb (100%) rename Library/Homebrew/test/{test => }/checksum_test.rb (100%) rename Library/Homebrew/test/{test => }/checksum_verification_test.rb (100%) rename Library/Homebrew/test/{test => }/cleaner_test.rb (100%) rename Library/Homebrew/test/{test => }/cleanup_test.rb (100%) rename Library/Homebrew/test/{test => }/command_test.rb (100%) rename Library/Homebrew/test/{test => }/commands_test.rb (100%) rename Library/Homebrew/test/{test => }/compiler_failure_test.rb (100%) rename Library/Homebrew/test/{test => }/compiler_selector_test.rb (100%) rename Library/Homebrew/test/{test => }/config_test.rb (100%) rename Library/Homebrew/test/{test => }/create_test.rb (100%) rename Library/Homebrew/test/{test => }/custom_command_test.rb (100%) rename Library/Homebrew/test/{test => }/dependencies_test.rb (100%) rename Library/Homebrew/test/{test => }/dependency_collector_test.rb (100%) rename Library/Homebrew/test/{test => }/dependency_expansion_test.rb (100%) rename Library/Homebrew/test/{test => }/dependency_test.rb (100%) rename Library/Homebrew/test/{test => }/deps_test.rb (100%) rename Library/Homebrew/test/{test => }/desc_test.rb (100%) rename Library/Homebrew/test/{test => }/descriptions_test.rb (100%) rename Library/Homebrew/test/{test => }/diagnostic_test.rb (100%) rename Library/Homebrew/test/{test => }/doctor_test.rb (100%) rename Library/Homebrew/test/{test => }/download_strategies_test.rb (100%) rename Library/Homebrew/test/{test => }/edit_test.rb (100%) rename Library/Homebrew/test/{test => }/exceptions_test.rb (100%) rename Library/Homebrew/test/{test => }/fetch_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_installer_bottle_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_installer_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_lock_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_pin_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_spec_selection_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_support_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_test.rb (100%) rename Library/Homebrew/test/{test => }/formula_validation_test.rb (100%) rename Library/Homebrew/test/{test => }/formulary_test.rb (100%) rename Library/Homebrew/test/{test => }/gpg2_requirement_test.rb (100%) rename Library/Homebrew/test/{test => }/gpg_test.rb (100%) rename Library/Homebrew/test/{test => }/hardware_test.rb (100%) rename Library/Homebrew/test/{test => }/help_test.rb (100%) rename Library/Homebrew/test/{test => }/home_test.rb (100%) rename Library/Homebrew/test/{test => }/info_test.rb (100%) rename Library/Homebrew/test/{test => }/inreplace_test.rb (100%) rename Library/Homebrew/test/{test => }/install_test.rb (100%) rename Library/Homebrew/test/{test => }/irb_test.rb (100%) rename Library/Homebrew/test/{test => }/json_test.rb (100%) rename Library/Homebrew/test/{test => }/keg_test.rb (100%) rename Library/Homebrew/test/{test => }/language_go_test.rb (100%) rename Library/Homebrew/test/{test => }/language_module_requirement_test.rb (100%) rename Library/Homebrew/test/{test => }/language_python_test.rb (100%) rename Library/Homebrew/test/{test => }/leaves_test.rb (100%) rename Library/Homebrew/test/{test => }/link_test.rb (100%) rename Library/Homebrew/test/{test => }/linkapps_test.rb (100%) rename Library/Homebrew/test/{test => }/list_test.rb (100%) rename Library/Homebrew/test/{test => }/log_formula_test.rb (100%) rename Library/Homebrew/test/{test => }/log_test.rb (100%) rename Library/Homebrew/test/{test => }/migrate_test.rb (100%) rename Library/Homebrew/test/{test => }/migrator_test.rb (100%) rename Library/Homebrew/test/{test => }/missing_test.rb (100%) rename Library/Homebrew/test/{test => }/mpi_requirement_test.rb (100%) rename Library/Homebrew/test/{test => }/options_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/blacklist_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/bottle_collector_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/bottle_tag_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/dependency_collector_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/diagnostic_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/keg_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/language_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/mach_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/version_test.rb (100%) rename Library/Homebrew/test/{test => }/os/mac/x11_requirement_test.rb (100%) rename Library/Homebrew/test/{test => }/outdated_test.rb (100%) rename Library/Homebrew/test/{test => }/patch_test.rb (100%) rename Library/Homebrew/test/{test => }/patching_test.rb (100%) rename Library/Homebrew/test/{test => }/pathname_test.rb (100%) rename Library/Homebrew/test/{test => }/pin_unpin_test.rb (100%) rename Library/Homebrew/test/{test => }/pkg_version_test.rb (100%) rename Library/Homebrew/test/{test => }/prefix_formula_test.rb (100%) rename Library/Homebrew/test/{test => }/prefix_test.rb (100%) rename Library/Homebrew/test/{test => }/prune_test.rb (100%) rename Library/Homebrew/test/{test => }/pull_offline_test.rb (100%) rename Library/Homebrew/test/{test => }/pull_test.rb (100%) rename Library/Homebrew/test/{test => }/readall_test.rb (100%) rename Library/Homebrew/test/{test => }/reinstall_pinned_test.rb (100%) rename Library/Homebrew/test/{test => }/reinstall_test.rb (100%) rename Library/Homebrew/test/{test => }/repository_test.rb (100%) rename Library/Homebrew/test/{test => }/requirement_test.rb (100%) rename Library/Homebrew/test/{test => }/resource_test.rb (100%) rename Library/Homebrew/test/{test => }/sandbox_test.rb (100%) rename Library/Homebrew/test/{test => }/search_remote_tap_test.rb (100%) rename Library/Homebrew/test/{test => }/search_test.rb (100%) rename Library/Homebrew/test/{test => }/services_test.rb (100%) rename Library/Homebrew/test/{test => }/sh_test.rb (100%) rename Library/Homebrew/test/{test => }/shell_test.rb (100%) rename Library/Homebrew/test/{test => }/software_spec_test.rb (100%) rename Library/Homebrew/test/{test => }/stdlib_test.rb (100%) rename Library/Homebrew/test/{test => }/string_test.rb (100%) rename Library/Homebrew/test/{test => }/switch_test.rb (100%) rename Library/Homebrew/test/{test => }/tab_test.rb (100%) rename Library/Homebrew/test/{test => }/tap_new_test.rb (100%) rename Library/Homebrew/test/{test => }/tap_test.rb (100%) rename Library/Homebrew/test/{test => }/test_formula_test.rb (100%) rename Library/Homebrew/test/{test => }/uninstall_test.rb (100%) rename Library/Homebrew/test/{test => }/unlink_test.rb (100%) rename Library/Homebrew/test/{test => }/unlinkapps_test.rb (100%) rename Library/Homebrew/test/{test => }/unpack_test.rb (100%) rename Library/Homebrew/test/{test => }/update_report_test.rb (100%) rename Library/Homebrew/test/{test => }/upgrade_test.rb (100%) rename Library/Homebrew/test/{test => }/uses_test.rb (100%) rename Library/Homebrew/test/{test => }/utils/tty_test.rb (100%) rename Library/Homebrew/test/{test => }/utils_test.rb (100%) rename Library/Homebrew/test/{test => }/version_test.rb (100%) rename Library/Homebrew/test/{test => }/versions_test.rb (100%) rename Library/Homebrew/test/{test => }/x11_requirement_test.rb (100%) diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb index 6562255161..c032b34372 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 similarity index 100% rename from Library/Homebrew/test/test/ARGV_test.rb rename to Library/Homebrew/test/ARGV_test.rb diff --git a/Library/Homebrew/test/test/ENV_test.rb b/Library/Homebrew/test/ENV_test.rb similarity index 100% rename from Library/Homebrew/test/test/ENV_test.rb rename to Library/Homebrew/test/ENV_test.rb diff --git a/Library/Homebrew/test/test/analytics_test.rb b/Library/Homebrew/test/analytics_test.rb similarity index 100% rename from Library/Homebrew/test/test/analytics_test.rb rename to Library/Homebrew/test/analytics_test.rb diff --git a/Library/Homebrew/test/test/audit_test.rb b/Library/Homebrew/test/audit_test.rb similarity index 100% rename from Library/Homebrew/test/test/audit_test.rb rename to Library/Homebrew/test/audit_test.rb diff --git a/Library/Homebrew/test/test/bash_test.rb b/Library/Homebrew/test/bash_test.rb similarity index 100% rename from Library/Homebrew/test/test/bash_test.rb rename to Library/Homebrew/test/bash_test.rb diff --git a/Library/Homebrew/test/test/blacklist_test.rb b/Library/Homebrew/test/blacklist_test.rb similarity index 100% rename from Library/Homebrew/test/test/blacklist_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/bottle_collector_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/bottle_filename_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/bottle_hooks_test.rb rename to Library/Homebrew/test/bottle_hooks_test.rb diff --git a/Library/Homebrew/test/test/bottle_test.rb b/Library/Homebrew/test/bottle_test.rb similarity index 100% rename from Library/Homebrew/test/test/bottle_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/build_environment_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/build_options_test.rb rename to Library/Homebrew/test/build_options_test.rb diff --git a/Library/Homebrew/test/test/bundle_test.rb b/Library/Homebrew/test/bundle_test.rb similarity index 100% rename from Library/Homebrew/test/test/bundle_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/cache_formula_test.rb rename to Library/Homebrew/test/cache_formula_test.rb diff --git a/Library/Homebrew/test/test/cache_test.rb b/Library/Homebrew/test/cache_test.rb similarity index 100% rename from Library/Homebrew/test/test/cache_test.rb rename to Library/Homebrew/test/cache_test.rb diff --git a/Library/Homebrew/test/test/cask_test.rb b/Library/Homebrew/test/cask_test.rb similarity index 100% rename from Library/Homebrew/test/test/cask_test.rb rename to Library/Homebrew/test/cask_test.rb diff --git a/Library/Homebrew/test/test/cat_test.rb b/Library/Homebrew/test/cat_test.rb similarity index 100% rename from Library/Homebrew/test/test/cat_test.rb rename to Library/Homebrew/test/cat_test.rb diff --git a/Library/Homebrew/test/test/caveats_test.rb b/Library/Homebrew/test/caveats_test.rb similarity index 100% rename from Library/Homebrew/test/test/caveats_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/cellar_formula_test.rb rename to Library/Homebrew/test/cellar_formula_test.rb diff --git a/Library/Homebrew/test/test/cellar_test.rb b/Library/Homebrew/test/cellar_test.rb similarity index 100% rename from Library/Homebrew/test/test/cellar_test.rb rename to Library/Homebrew/test/cellar_test.rb diff --git a/Library/Homebrew/test/test/checksum_test.rb b/Library/Homebrew/test/checksum_test.rb similarity index 100% rename from Library/Homebrew/test/test/checksum_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/checksum_verification_test.rb rename to Library/Homebrew/test/checksum_verification_test.rb diff --git a/Library/Homebrew/test/test/cleaner_test.rb b/Library/Homebrew/test/cleaner_test.rb similarity index 100% rename from Library/Homebrew/test/test/cleaner_test.rb rename to Library/Homebrew/test/cleaner_test.rb diff --git a/Library/Homebrew/test/test/cleanup_test.rb b/Library/Homebrew/test/cleanup_test.rb similarity index 100% rename from Library/Homebrew/test/test/cleanup_test.rb rename to Library/Homebrew/test/cleanup_test.rb diff --git a/Library/Homebrew/test/test/command_test.rb b/Library/Homebrew/test/command_test.rb similarity index 100% rename from Library/Homebrew/test/test/command_test.rb rename to Library/Homebrew/test/command_test.rb diff --git a/Library/Homebrew/test/test/commands_test.rb b/Library/Homebrew/test/commands_test.rb similarity index 100% rename from Library/Homebrew/test/test/commands_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/compiler_failure_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/compiler_selector_test.rb rename to Library/Homebrew/test/compiler_selector_test.rb diff --git a/Library/Homebrew/test/test/config_test.rb b/Library/Homebrew/test/config_test.rb similarity index 100% rename from Library/Homebrew/test/test/config_test.rb rename to Library/Homebrew/test/config_test.rb diff --git a/Library/Homebrew/test/test/create_test.rb b/Library/Homebrew/test/create_test.rb similarity index 100% rename from Library/Homebrew/test/test/create_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/custom_command_test.rb rename to Library/Homebrew/test/custom_command_test.rb diff --git a/Library/Homebrew/test/test/dependencies_test.rb b/Library/Homebrew/test/dependencies_test.rb similarity index 100% rename from Library/Homebrew/test/test/dependencies_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/dependency_collector_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/dependency_expansion_test.rb rename to Library/Homebrew/test/dependency_expansion_test.rb diff --git a/Library/Homebrew/test/test/dependency_test.rb b/Library/Homebrew/test/dependency_test.rb similarity index 100% rename from Library/Homebrew/test/test/dependency_test.rb rename to Library/Homebrew/test/dependency_test.rb diff --git a/Library/Homebrew/test/test/deps_test.rb b/Library/Homebrew/test/deps_test.rb similarity index 100% rename from Library/Homebrew/test/test/deps_test.rb rename to Library/Homebrew/test/deps_test.rb diff --git a/Library/Homebrew/test/test/desc_test.rb b/Library/Homebrew/test/desc_test.rb similarity index 100% rename from Library/Homebrew/test/test/desc_test.rb rename to Library/Homebrew/test/desc_test.rb diff --git a/Library/Homebrew/test/test/descriptions_test.rb b/Library/Homebrew/test/descriptions_test.rb similarity index 100% rename from Library/Homebrew/test/test/descriptions_test.rb rename to Library/Homebrew/test/descriptions_test.rb diff --git a/Library/Homebrew/test/test/diagnostic_test.rb b/Library/Homebrew/test/diagnostic_test.rb similarity index 100% rename from Library/Homebrew/test/test/diagnostic_test.rb rename to Library/Homebrew/test/diagnostic_test.rb diff --git a/Library/Homebrew/test/test/doctor_test.rb b/Library/Homebrew/test/doctor_test.rb similarity index 100% rename from Library/Homebrew/test/test/doctor_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/download_strategies_test.rb rename to Library/Homebrew/test/download_strategies_test.rb diff --git a/Library/Homebrew/test/test/edit_test.rb b/Library/Homebrew/test/edit_test.rb similarity index 100% rename from Library/Homebrew/test/test/edit_test.rb rename to Library/Homebrew/test/edit_test.rb diff --git a/Library/Homebrew/test/test/exceptions_test.rb b/Library/Homebrew/test/exceptions_test.rb similarity index 100% rename from Library/Homebrew/test/test/exceptions_test.rb rename to Library/Homebrew/test/exceptions_test.rb diff --git a/Library/Homebrew/test/test/fetch_test.rb b/Library/Homebrew/test/fetch_test.rb similarity index 100% rename from Library/Homebrew/test/test/fetch_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_installer_bottle_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_installer_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_lock_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_pin_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_spec_selection_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_support_test.rb rename to Library/Homebrew/test/formula_support_test.rb diff --git a/Library/Homebrew/test/test/formula_test.rb b/Library/Homebrew/test/formula_test.rb similarity index 100% rename from Library/Homebrew/test/test/formula_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/formula_validation_test.rb rename to Library/Homebrew/test/formula_validation_test.rb diff --git a/Library/Homebrew/test/test/formulary_test.rb b/Library/Homebrew/test/formulary_test.rb similarity index 100% rename from Library/Homebrew/test/test/formulary_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/gpg2_requirement_test.rb rename to Library/Homebrew/test/gpg2_requirement_test.rb diff --git a/Library/Homebrew/test/test/gpg_test.rb b/Library/Homebrew/test/gpg_test.rb similarity index 100% rename from Library/Homebrew/test/test/gpg_test.rb rename to Library/Homebrew/test/gpg_test.rb diff --git a/Library/Homebrew/test/test/hardware_test.rb b/Library/Homebrew/test/hardware_test.rb similarity index 100% rename from Library/Homebrew/test/test/hardware_test.rb rename to Library/Homebrew/test/hardware_test.rb diff --git a/Library/Homebrew/test/test/help_test.rb b/Library/Homebrew/test/help_test.rb similarity index 100% rename from Library/Homebrew/test/test/help_test.rb rename to Library/Homebrew/test/help_test.rb diff --git a/Library/Homebrew/test/test/home_test.rb b/Library/Homebrew/test/home_test.rb similarity index 100% rename from Library/Homebrew/test/test/home_test.rb rename to Library/Homebrew/test/home_test.rb diff --git a/Library/Homebrew/test/test/info_test.rb b/Library/Homebrew/test/info_test.rb similarity index 100% rename from Library/Homebrew/test/test/info_test.rb rename to Library/Homebrew/test/info_test.rb diff --git a/Library/Homebrew/test/test/inreplace_test.rb b/Library/Homebrew/test/inreplace_test.rb similarity index 100% rename from Library/Homebrew/test/test/inreplace_test.rb rename to Library/Homebrew/test/inreplace_test.rb diff --git a/Library/Homebrew/test/test/install_test.rb b/Library/Homebrew/test/install_test.rb similarity index 100% rename from Library/Homebrew/test/test/install_test.rb rename to Library/Homebrew/test/install_test.rb diff --git a/Library/Homebrew/test/test/irb_test.rb b/Library/Homebrew/test/irb_test.rb similarity index 100% rename from Library/Homebrew/test/test/irb_test.rb rename to Library/Homebrew/test/irb_test.rb diff --git a/Library/Homebrew/test/test/json_test.rb b/Library/Homebrew/test/json_test.rb similarity index 100% rename from Library/Homebrew/test/test/json_test.rb rename to Library/Homebrew/test/json_test.rb diff --git a/Library/Homebrew/test/test/keg_test.rb b/Library/Homebrew/test/keg_test.rb similarity index 100% rename from Library/Homebrew/test/test/keg_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/language_go_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/language_module_requirement_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/language_python_test.rb rename to Library/Homebrew/test/language_python_test.rb diff --git a/Library/Homebrew/test/test/leaves_test.rb b/Library/Homebrew/test/leaves_test.rb similarity index 100% rename from Library/Homebrew/test/test/leaves_test.rb rename to Library/Homebrew/test/leaves_test.rb diff --git a/Library/Homebrew/test/test/link_test.rb b/Library/Homebrew/test/link_test.rb similarity index 100% rename from Library/Homebrew/test/test/link_test.rb rename to Library/Homebrew/test/link_test.rb diff --git a/Library/Homebrew/test/test/linkapps_test.rb b/Library/Homebrew/test/linkapps_test.rb similarity index 100% rename from Library/Homebrew/test/test/linkapps_test.rb rename to Library/Homebrew/test/linkapps_test.rb diff --git a/Library/Homebrew/test/test/list_test.rb b/Library/Homebrew/test/list_test.rb similarity index 100% rename from Library/Homebrew/test/test/list_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/log_formula_test.rb rename to Library/Homebrew/test/log_formula_test.rb diff --git a/Library/Homebrew/test/test/log_test.rb b/Library/Homebrew/test/log_test.rb similarity index 100% rename from Library/Homebrew/test/test/log_test.rb rename to Library/Homebrew/test/log_test.rb diff --git a/Library/Homebrew/test/test/migrate_test.rb b/Library/Homebrew/test/migrate_test.rb similarity index 100% rename from Library/Homebrew/test/test/migrate_test.rb rename to Library/Homebrew/test/migrate_test.rb diff --git a/Library/Homebrew/test/test/migrator_test.rb b/Library/Homebrew/test/migrator_test.rb similarity index 100% rename from Library/Homebrew/test/test/migrator_test.rb rename to Library/Homebrew/test/migrator_test.rb diff --git a/Library/Homebrew/test/test/missing_test.rb b/Library/Homebrew/test/missing_test.rb similarity index 100% rename from Library/Homebrew/test/test/missing_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/mpi_requirement_test.rb rename to Library/Homebrew/test/mpi_requirement_test.rb diff --git a/Library/Homebrew/test/test/options_test.rb b/Library/Homebrew/test/options_test.rb similarity index 100% rename from Library/Homebrew/test/test/options_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/blacklist_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/bottle_collector_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/bottle_tag_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/dependency_collector_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/diagnostic_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/keg_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/language_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/mach_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/version_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/os/mac/x11_requirement_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/outdated_test.rb rename to Library/Homebrew/test/outdated_test.rb diff --git a/Library/Homebrew/test/test/patch_test.rb b/Library/Homebrew/test/patch_test.rb similarity index 100% rename from Library/Homebrew/test/test/patch_test.rb rename to Library/Homebrew/test/patch_test.rb diff --git a/Library/Homebrew/test/test/patching_test.rb b/Library/Homebrew/test/patching_test.rb similarity index 100% rename from Library/Homebrew/test/test/patching_test.rb rename to Library/Homebrew/test/patching_test.rb diff --git a/Library/Homebrew/test/test/pathname_test.rb b/Library/Homebrew/test/pathname_test.rb similarity index 100% rename from Library/Homebrew/test/test/pathname_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/pin_unpin_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/pkg_version_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/prefix_formula_test.rb rename to Library/Homebrew/test/prefix_formula_test.rb diff --git a/Library/Homebrew/test/test/prefix_test.rb b/Library/Homebrew/test/prefix_test.rb similarity index 100% rename from Library/Homebrew/test/test/prefix_test.rb rename to Library/Homebrew/test/prefix_test.rb diff --git a/Library/Homebrew/test/test/prune_test.rb b/Library/Homebrew/test/prune_test.rb similarity index 100% rename from Library/Homebrew/test/test/prune_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/pull_offline_test.rb rename to Library/Homebrew/test/pull_offline_test.rb diff --git a/Library/Homebrew/test/test/pull_test.rb b/Library/Homebrew/test/pull_test.rb similarity index 100% rename from Library/Homebrew/test/test/pull_test.rb rename to Library/Homebrew/test/pull_test.rb diff --git a/Library/Homebrew/test/test/readall_test.rb b/Library/Homebrew/test/readall_test.rb similarity index 100% rename from Library/Homebrew/test/test/readall_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/reinstall_pinned_test.rb rename to Library/Homebrew/test/reinstall_pinned_test.rb diff --git a/Library/Homebrew/test/test/reinstall_test.rb b/Library/Homebrew/test/reinstall_test.rb similarity index 100% rename from Library/Homebrew/test/test/reinstall_test.rb rename to Library/Homebrew/test/reinstall_test.rb diff --git a/Library/Homebrew/test/test/repository_test.rb b/Library/Homebrew/test/repository_test.rb similarity index 100% rename from Library/Homebrew/test/test/repository_test.rb rename to Library/Homebrew/test/repository_test.rb diff --git a/Library/Homebrew/test/test/requirement_test.rb b/Library/Homebrew/test/requirement_test.rb similarity index 100% rename from Library/Homebrew/test/test/requirement_test.rb rename to Library/Homebrew/test/requirement_test.rb diff --git a/Library/Homebrew/test/test/resource_test.rb b/Library/Homebrew/test/resource_test.rb similarity index 100% rename from Library/Homebrew/test/test/resource_test.rb rename to Library/Homebrew/test/resource_test.rb diff --git a/Library/Homebrew/test/test/sandbox_test.rb b/Library/Homebrew/test/sandbox_test.rb similarity index 100% rename from Library/Homebrew/test/test/sandbox_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/search_remote_tap_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/search_test.rb rename to Library/Homebrew/test/search_test.rb diff --git a/Library/Homebrew/test/test/services_test.rb b/Library/Homebrew/test/services_test.rb similarity index 100% rename from Library/Homebrew/test/test/services_test.rb rename to Library/Homebrew/test/services_test.rb diff --git a/Library/Homebrew/test/test/sh_test.rb b/Library/Homebrew/test/sh_test.rb similarity index 100% rename from Library/Homebrew/test/test/sh_test.rb rename to Library/Homebrew/test/sh_test.rb diff --git a/Library/Homebrew/test/test/shell_test.rb b/Library/Homebrew/test/shell_test.rb similarity index 100% rename from Library/Homebrew/test/test/shell_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/software_spec_test.rb rename to Library/Homebrew/test/software_spec_test.rb diff --git a/Library/Homebrew/test/test/stdlib_test.rb b/Library/Homebrew/test/stdlib_test.rb similarity index 100% rename from Library/Homebrew/test/test/stdlib_test.rb rename to Library/Homebrew/test/stdlib_test.rb diff --git a/Library/Homebrew/test/test/string_test.rb b/Library/Homebrew/test/string_test.rb similarity index 100% rename from Library/Homebrew/test/test/string_test.rb rename to Library/Homebrew/test/string_test.rb diff --git a/Library/Homebrew/test/test/switch_test.rb b/Library/Homebrew/test/switch_test.rb similarity index 100% rename from Library/Homebrew/test/test/switch_test.rb rename to Library/Homebrew/test/switch_test.rb diff --git a/Library/Homebrew/test/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb similarity index 100% rename from Library/Homebrew/test/test/tab_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/tap_new_test.rb rename to Library/Homebrew/test/tap_new_test.rb diff --git a/Library/Homebrew/test/test/tap_test.rb b/Library/Homebrew/test/tap_test.rb similarity index 100% rename from Library/Homebrew/test/test/tap_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/test_formula_test.rb rename to Library/Homebrew/test/test_formula_test.rb diff --git a/Library/Homebrew/test/test/uninstall_test.rb b/Library/Homebrew/test/uninstall_test.rb similarity index 100% rename from Library/Homebrew/test/test/uninstall_test.rb rename to Library/Homebrew/test/uninstall_test.rb diff --git a/Library/Homebrew/test/test/unlink_test.rb b/Library/Homebrew/test/unlink_test.rb similarity index 100% rename from Library/Homebrew/test/test/unlink_test.rb rename to Library/Homebrew/test/unlink_test.rb diff --git a/Library/Homebrew/test/test/unlinkapps_test.rb b/Library/Homebrew/test/unlinkapps_test.rb similarity index 100% rename from Library/Homebrew/test/test/unlinkapps_test.rb rename to Library/Homebrew/test/unlinkapps_test.rb diff --git a/Library/Homebrew/test/test/unpack_test.rb b/Library/Homebrew/test/unpack_test.rb similarity index 100% rename from Library/Homebrew/test/test/unpack_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/update_report_test.rb rename to Library/Homebrew/test/update_report_test.rb diff --git a/Library/Homebrew/test/test/upgrade_test.rb b/Library/Homebrew/test/upgrade_test.rb similarity index 100% rename from Library/Homebrew/test/test/upgrade_test.rb rename to Library/Homebrew/test/upgrade_test.rb diff --git a/Library/Homebrew/test/test/uses_test.rb b/Library/Homebrew/test/uses_test.rb similarity index 100% rename from Library/Homebrew/test/test/uses_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/utils/tty_test.rb rename to Library/Homebrew/test/utils/tty_test.rb diff --git a/Library/Homebrew/test/test/utils_test.rb b/Library/Homebrew/test/utils_test.rb similarity index 100% rename from Library/Homebrew/test/test/utils_test.rb rename to Library/Homebrew/test/utils_test.rb diff --git a/Library/Homebrew/test/test/version_test.rb b/Library/Homebrew/test/version_test.rb similarity index 100% rename from Library/Homebrew/test/test/version_test.rb rename to Library/Homebrew/test/version_test.rb diff --git a/Library/Homebrew/test/test/versions_test.rb b/Library/Homebrew/test/versions_test.rb similarity index 100% rename from Library/Homebrew/test/test/versions_test.rb rename to 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 similarity index 100% rename from Library/Homebrew/test/test/x11_requirement_test.rb rename to Library/Homebrew/test/x11_requirement_test.rb