From 6b6b27126d7ecc1dde9a6bc166a7e1daa3af35d2 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 21 Oct 2016 08:57:39 +0200 Subject: [PATCH 1/8] 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 From e3be9c068bd2168d3bbf077a55abb15a87eaf5bd Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 24 Oct 2016 18:57:57 +0200 Subject: [PATCH 2/8] Update `.rubocop_todo.yml`. --- Library/Homebrew/.rubocop_todo.yml | 6 +++--- Library/Homebrew/dev-cmd/audit.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/.rubocop_todo.yml b/Library/Homebrew/.rubocop_todo.yml index 867a61966f..9e48c6792f 100644 --- a/Library/Homebrew/.rubocop_todo.yml +++ b/Library/Homebrew/.rubocop_todo.yml @@ -21,7 +21,7 @@ Lint/HandleExceptions: - 'extend/pathname.rb' - 'formula.rb' - 'formula_versions.rb' - - 'test/test_ENV.rb' + - 'test/ENV_test.rb' # Offense count: 3 Lint/IneffectiveAccessModifier: @@ -51,7 +51,7 @@ Lint/RescueException: - 'postinstall.rb' - 'readall.rb' - 'test.rb' - - 'test/test_ENV.rb' + - 'test/ENV_test.rb' - 'utils/fork.rb' # Offense count: 1 @@ -114,7 +114,7 @@ Style/MultilineBlockChain: - 'dev-cmd/audit.rb' - 'dev-cmd/man.rb' - 'diagnostic.rb' - - 'test/test_patching.rb' + - 'test/patching_test.rb' # Offense count: 4 # Cop supports --auto-correct. diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index c7461fc5ab..df3b5fafe7 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -761,7 +761,7 @@ class FormulaAuditor bin_names.each do |name| ["system", "shell_output", "pipe_output"].each do |cmd| if text =~ /(def test|test do).*#{cmd}[\(\s]+['"]#{Regexp.escape name}[\s'"]/m - problem %(fully scope test #{cmd} calls e.g. #{cmd} "\#{bin}/#{name}") + problem %Q(fully scope test #{cmd} calls e.g. #{cmd} "\#{bin}/#{name}") end end end From 4efdbbde06bc8785870315f7a334694e59b33528 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 24 Oct 2016 23:11:23 +0200 Subject: [PATCH 3/8] Rename `fs_leak_log` to `fs_leak.log` and move to `tmp`. --- Library/Homebrew/dev-cmd/tests.rb | 2 +- Library/Homebrew/test/testing_env.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb index df9a00a162..6562255161 100644 --- a/Library/Homebrew/dev-cmd/tests.rb +++ b/Library/Homebrew/dev-cmd/tests.rb @@ -65,7 +65,7 @@ module Homebrew Homebrew.failed = !$?.success? - if (fs_leak_log = HOMEBREW_LIBRARY/"Homebrew/test/fs_leak_log").file? + if (fs_leak_log = HOMEBREW_LIBRARY_PATH/"tmp/fs_leak.log").file? fs_leak_log_content = fs_leak_log.read unless fs_leak_log_content.empty? opoo "File leak is detected" diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index 3fbf3e4b5a..d441b4f1c8 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -43,7 +43,7 @@ module Homebrew module FSLeakLogger def self.included(klass) require "find" - @@log = File.open("#{__dir__}/fs_leak_log", "w") + @@log = File.open(HOMEBREW_LIBRARY_PATH/"tmp/fs_leak.log", "w") klass.make_my_diffs_pretty! end From 4db1317f38f5a55574854e7bf1dfe4379e807b4f Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 24 Oct 2016 22:53:25 +0200 Subject: [PATCH 4/8] Move all remaining fixtures to `test/support/fixtures`. --- Library/Homebrew/cask/spec/spec_helper.rb | 6 +++--- Library/Homebrew/cask/test/test_helper.rb | 6 +++--- ...estball_bottle-0.1.el_capitan.bottle.tar.gz | 0 ...tball_bottle-0.1.linux_x86_64.bottle.tar.gz | 0 ...ll_bottle-0.1.macintosh_intel.bottle.tar.gz | 0 ...testball_bottle-0.1.mavericks.bottle.tar.gz | 0 ...ball_bottle-0.1.mountain_lion.bottle.tar.gz | 0 .../testball_bottle-0.1.sierra.bottle.tar.gz | 0 .../testball_bottle-0.1.yosemite.bottle.tar.gz | Bin .../fixtures/cask/AppWithBinary.zip | Bin .../fixtures/cask/AppWithEmbeddedBinary.zip | Bin .../{ => support}/fixtures/cask/MyFancyApp.zip | Bin .../{ => support}/fixtures/cask/MyFancyPkg.zip | Bin .../fixtures/cask/NestedApp.dmg.zip | Bin .../fixtures/cask/caffeine-suite.zip | Bin .../{ => support}/fixtures/cask/caffeine.zip | Bin .../fixtures/cask/caffeines-subdir.zip | Bin .../{ => support}/fixtures/cask/caffeines.zip | Bin .../{ => support}/fixtures/cask/container.7z | Bin .../{ => support}/fixtures/cask/container.air | Bin .../{ => support}/fixtures/cask/container.bz2 | Bin .../{ => support}/fixtures/cask/container.cab | Bin .../{ => support}/fixtures/cask/container.dmg | Bin .../{ => support}/fixtures/cask/container.gz | Bin .../{ => support}/fixtures/cask/container.lzma | Bin .../{ => support}/fixtures/cask/container.pkg | Bin .../{ => support}/fixtures/cask/container.rar | Bin .../{ => support}/fixtures/cask/container.sit | Bin .../fixtures/cask/container.tar.gz | Bin .../{ => support}/fixtures/cask/container.xar | Bin .../{ => support}/fixtures/cask/container.xz | Bin .../fixtures/cask/empty_directory/.gitignore | 0 .../fixtures/cask/naked_executable | 0 .../fixtures/cask/transmission-2.61.dmg | Bin .../test/{ => support/fixtures}/mach/a.out | Bin .../{ => support/fixtures}/mach/fat.bundle | Bin .../test/{ => support/fixtures}/mach/fat.dylib | Bin .../{ => support/fixtures}/mach/i386.bundle | Bin .../{ => support/fixtures}/mach/i386.dylib | Bin .../{ => support/fixtures}/mach/x86_64.bundle | Bin .../{ => support/fixtures}/mach/x86_64.dylib | Bin .../{ => support/fixtures}/patches/noop-a.diff | 0 .../{ => support/fixtures}/patches/noop-b.diff | 0 .../{ => support/fixtures}/patches/noop-c.diff | 0 .../test/{ => support}/fixtures/receipt.json | 0 .../{ => support}/fixtures/receipt_old.json | 0 .../tarballs/testball-0.1-patches.tgz | Bin .../fixtures}/tarballs/testball-0.1.tbz | Bin .../fixtures}/tarballs/testbottest-0.1.tbz | Bin .../test/{ => support}/fixtures/test.diff | 0 .../test/{ => support}/fixtures/test.eps | 0 .../test/{ => support}/fixtures/test.gif | Bin .../test/{ => support}/fixtures/test.ico | Bin .../test/{ => support}/fixtures/test.jpg | Bin .../test/{ => support}/fixtures/test.m4a | Bin .../test/{ => support}/fixtures/test.mp3 | Bin .../test/{ => support}/fixtures/test.pcap | Bin .../test/{ => support}/fixtures/test.pdf | 0 .../test/{ => support}/fixtures/test.png | Bin .../test/{ => support}/fixtures/test.ps | 0 .../test/{ => support}/fixtures/test.svg | 0 .../test/{ => support}/fixtures/test.tiff | Bin .../test/{ => support}/fixtures/test.wav | Bin .../test/{ => support/fixtures}/testball.rb | 2 +- .../{ => support/fixtures}/testball_bottle.rb | 4 ++-- .../test/{ => support/fixtures}/testbottest.rb | 2 +- .../fixtures/updater_fixture.yaml | 0 .../Homebrew/test/{ => support}/helper/env.rb | 0 .../helper/integration_command_test_case.rb | 8 ++++---- .../test/{ => support}/helper/shutup.rb | 0 .../Homebrew/test/{ => support}/lib/config.rb | 4 ++-- .../{ => support}/lib/integration_mocks.rb | 0 Library/Homebrew/test/test/ENV_test.rb | 3 ++- Library/Homebrew/test/test/analytics_test.rb | 3 ++- Library/Homebrew/test/test/bottle_test.rb | 3 ++- Library/Homebrew/test/test/bundle_test.rb | 3 ++- .../Homebrew/test/test/cache_formula_test.rb | 3 ++- Library/Homebrew/test/test/cache_test.rb | 3 ++- Library/Homebrew/test/test/cask_test.rb | 3 ++- Library/Homebrew/test/test/cat_test.rb | 3 ++- .../Homebrew/test/test/cellar_formula_test.rb | 3 ++- Library/Homebrew/test/test/cellar_test.rb | 3 ++- .../test/test/checksum_verification_test.rb | 2 +- Library/Homebrew/test/test/cleaner_test.rb | 4 ++-- Library/Homebrew/test/test/cleanup_test.rb | 5 +++-- Library/Homebrew/test/test/command_test.rb | 3 ++- Library/Homebrew/test/test/commands_test.rb | 3 ++- Library/Homebrew/test/test/config_test.rb | 3 ++- Library/Homebrew/test/test/create_test.rb | 5 +++-- .../Homebrew/test/test/custom_command_test.rb | 3 ++- Library/Homebrew/test/test/deps_test.rb | 3 ++- Library/Homebrew/test/test/desc_test.rb | 3 ++- Library/Homebrew/test/test/doctor_test.rb | 3 ++- Library/Homebrew/test/test/edit_test.rb | 3 ++- Library/Homebrew/test/test/fetch_test.rb | 3 ++- .../test/test/formula_installer_bottle_test.rb | 4 ++-- .../test/test/formula_installer_test.rb | 4 ++-- Library/Homebrew/test/test/formula_test.rb | 2 +- Library/Homebrew/test/test/formulary_test.rb | 4 ++-- Library/Homebrew/test/test/help_test.rb | 3 ++- Library/Homebrew/test/test/home_test.rb | 3 ++- Library/Homebrew/test/test/info_test.rb | 3 ++- Library/Homebrew/test/test/install_test.rb | 3 ++- Library/Homebrew/test/test/irb_test.rb | 3 ++- Library/Homebrew/test/test/leaves_test.rb | 3 ++- Library/Homebrew/test/test/link_test.rb | 3 ++- Library/Homebrew/test/test/linkapps_test.rb | 3 ++- Library/Homebrew/test/test/list_test.rb | 3 ++- Library/Homebrew/test/test/log_formula_test.rb | 3 ++- Library/Homebrew/test/test/log_test.rb | 3 ++- Library/Homebrew/test/test/migrate_test.rb | 3 ++- Library/Homebrew/test/test/migrator_test.rb | 2 +- Library/Homebrew/test/test/missing_test.rb | 3 ++- Library/Homebrew/test/test/options_test.rb | 3 ++- Library/Homebrew/test/test/os/mac/mach_test.rb | 4 ++-- Library/Homebrew/test/test/outdated_test.rb | 3 ++- Library/Homebrew/test/test/patching_test.rb | 12 ++++++------ Library/Homebrew/test/test/pin_unpin_test.rb | 3 ++- .../Homebrew/test/test/prefix_formula_test.rb | 3 ++- Library/Homebrew/test/test/prefix_test.rb | 3 ++- Library/Homebrew/test/test/prune_test.rb | 3 ++- .../Homebrew/test/test/pull_offline_test.rb | 3 ++- Library/Homebrew/test/test/pull_test.rb | 3 ++- Library/Homebrew/test/test/readall_test.rb | 3 ++- .../test/test/reinstall_pinned_test.rb | 3 ++- Library/Homebrew/test/test/reinstall_test.rb | 3 ++- Library/Homebrew/test/test/repository_test.rb | 3 ++- Library/Homebrew/test/test/search_test.rb | 3 ++- Library/Homebrew/test/test/services_test.rb | 3 ++- Library/Homebrew/test/test/sh_test.rb | 3 ++- Library/Homebrew/test/test/switch_test.rb | 3 ++- Library/Homebrew/test/test/tab_test.rb | 2 +- Library/Homebrew/test/test/tap_new_test.rb | 3 ++- Library/Homebrew/test/test/tap_test.rb | 3 ++- .../Homebrew/test/test/test_formula_test.rb | 5 +++-- Library/Homebrew/test/test/uninstall_test.rb | 2 +- Library/Homebrew/test/test/unlink_test.rb | 3 ++- Library/Homebrew/test/test/unlinkapps_test.rb | 3 ++- Library/Homebrew/test/test/unpack_test.rb | 3 ++- Library/Homebrew/test/test/upgrade_test.rb | 3 ++- Library/Homebrew/test/test/uses_test.rb | 3 ++- Library/Homebrew/test/test/version_test.rb | 3 ++- Library/Homebrew/test/testing_env.rb | 17 ++++++++--------- 143 files changed, 166 insertions(+), 108 deletions(-) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.sierra.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support/fixtures}/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/AppWithBinary.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/AppWithEmbeddedBinary.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/MyFancyApp.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/MyFancyPkg.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/NestedApp.dmg.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/caffeine-suite.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/caffeine.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/caffeines-subdir.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/caffeines.zip (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.7z (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.air (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.bz2 (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.cab (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.dmg (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.gz (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.lzma (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.pkg (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.rar (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.sit (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.tar.gz (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.xar (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/container.xz (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/empty_directory/.gitignore (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/naked_executable (100%) rename Library/Homebrew/test/{ => support}/fixtures/cask/transmission-2.61.dmg (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/a.out (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/fat.bundle (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/fat.dylib (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/i386.bundle (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/i386.dylib (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/x86_64.bundle (100%) rename Library/Homebrew/test/{ => support/fixtures}/mach/x86_64.dylib (100%) rename Library/Homebrew/test/{ => support/fixtures}/patches/noop-a.diff (100%) rename Library/Homebrew/test/{ => support/fixtures}/patches/noop-b.diff (100%) rename Library/Homebrew/test/{ => support/fixtures}/patches/noop-c.diff (100%) rename Library/Homebrew/test/{ => support}/fixtures/receipt.json (100%) rename Library/Homebrew/test/{ => support}/fixtures/receipt_old.json (100%) rename Library/Homebrew/test/{ => support/fixtures}/tarballs/testball-0.1-patches.tgz (100%) rename Library/Homebrew/test/{ => support/fixtures}/tarballs/testball-0.1.tbz (100%) rename Library/Homebrew/test/{ => support/fixtures}/tarballs/testbottest-0.1.tbz (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.diff (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.eps (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.gif (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.ico (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.jpg (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.m4a (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.mp3 (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.pcap (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.pdf (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.png (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.ps (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.svg (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.tiff (100%) rename Library/Homebrew/test/{ => support}/fixtures/test.wav (100%) rename Library/Homebrew/test/{ => support/fixtures}/testball.rb (78%) rename Library/Homebrew/test/{ => support/fixtures}/testball_bottle.rb (76%) rename Library/Homebrew/test/{ => support/fixtures}/testbottest.rb (82%) rename Library/Homebrew/test/{ => support}/fixtures/updater_fixture.yaml (100%) rename Library/Homebrew/test/{ => support}/helper/env.rb (100%) rename Library/Homebrew/test/{ => support}/helper/integration_command_test_case.rb (96%) rename Library/Homebrew/test/{ => support}/helper/shutup.rb (100%) rename Library/Homebrew/test/{ => support}/lib/config.rb (95%) rename Library/Homebrew/test/{ => support}/lib/integration_mocks.rb (100%) diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb index 7e72a2cee5..458fe00f4f 100644 --- a/Library/Homebrew/cask/spec/spec_helper.rb +++ b/Library/Homebrew/cask/spec/spec_helper.rb @@ -8,15 +8,15 @@ end # add Homebrew to load path $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew")) -$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/lib")) +$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/support/lib")) require "global" # add Homebrew-Cask to load path $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s) -require "test/helper/env" -require "test/helper/shutup" +require "test/support/helper/env" +require "test/support/helper/shutup" Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "*.rb")).each(&method(:require)) diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb index 73459cb25c..275ede3048 100644 --- a/Library/Homebrew/cask/test/test_helper.rb +++ b/Library/Homebrew/cask/test/test_helper.rb @@ -6,15 +6,15 @@ require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"] # add Homebrew to load path $LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew")) -$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/lib")) +$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew/test/support/lib")) require "global" # add Homebrew-Cask to load path $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s) -require "test/helper/env" -require "test/helper/shutup" +require "test/support/helper/env" +require "test/support/helper/shutup" include Test::Helper::Env include Test::Helper::Shutup diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.el_capitan.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.linux_x86_64.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.macintosh_intel.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mavericks.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.mountain_lion.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.sierra.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.sierra.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.sierra.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.sierra.bottle.tar.gz diff --git a/Library/Homebrew/test/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz b/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz similarity index 100% rename from Library/Homebrew/test/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz rename to Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz diff --git a/Library/Homebrew/test/fixtures/cask/AppWithBinary.zip b/Library/Homebrew/test/support/fixtures/cask/AppWithBinary.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/AppWithBinary.zip rename to Library/Homebrew/test/support/fixtures/cask/AppWithBinary.zip diff --git a/Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip b/Library/Homebrew/test/support/fixtures/cask/AppWithEmbeddedBinary.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/AppWithEmbeddedBinary.zip rename to Library/Homebrew/test/support/fixtures/cask/AppWithEmbeddedBinary.zip diff --git a/Library/Homebrew/test/fixtures/cask/MyFancyApp.zip b/Library/Homebrew/test/support/fixtures/cask/MyFancyApp.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/MyFancyApp.zip rename to Library/Homebrew/test/support/fixtures/cask/MyFancyApp.zip diff --git a/Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip b/Library/Homebrew/test/support/fixtures/cask/MyFancyPkg.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/MyFancyPkg.zip rename to Library/Homebrew/test/support/fixtures/cask/MyFancyPkg.zip diff --git a/Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip b/Library/Homebrew/test/support/fixtures/cask/NestedApp.dmg.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/NestedApp.dmg.zip rename to Library/Homebrew/test/support/fixtures/cask/NestedApp.dmg.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeine-suite.zip b/Library/Homebrew/test/support/fixtures/cask/caffeine-suite.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/caffeine-suite.zip rename to Library/Homebrew/test/support/fixtures/cask/caffeine-suite.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeine.zip b/Library/Homebrew/test/support/fixtures/cask/caffeine.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/caffeine.zip rename to Library/Homebrew/test/support/fixtures/cask/caffeine.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip b/Library/Homebrew/test/support/fixtures/cask/caffeines-subdir.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/caffeines-subdir.zip rename to Library/Homebrew/test/support/fixtures/cask/caffeines-subdir.zip diff --git a/Library/Homebrew/test/fixtures/cask/caffeines.zip b/Library/Homebrew/test/support/fixtures/cask/caffeines.zip similarity index 100% rename from Library/Homebrew/test/fixtures/cask/caffeines.zip rename to Library/Homebrew/test/support/fixtures/cask/caffeines.zip diff --git a/Library/Homebrew/test/fixtures/cask/container.7z b/Library/Homebrew/test/support/fixtures/cask/container.7z similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.7z rename to Library/Homebrew/test/support/fixtures/cask/container.7z diff --git a/Library/Homebrew/test/fixtures/cask/container.air b/Library/Homebrew/test/support/fixtures/cask/container.air similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.air rename to Library/Homebrew/test/support/fixtures/cask/container.air diff --git a/Library/Homebrew/test/fixtures/cask/container.bz2 b/Library/Homebrew/test/support/fixtures/cask/container.bz2 similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.bz2 rename to Library/Homebrew/test/support/fixtures/cask/container.bz2 diff --git a/Library/Homebrew/test/fixtures/cask/container.cab b/Library/Homebrew/test/support/fixtures/cask/container.cab similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.cab rename to Library/Homebrew/test/support/fixtures/cask/container.cab diff --git a/Library/Homebrew/test/fixtures/cask/container.dmg b/Library/Homebrew/test/support/fixtures/cask/container.dmg similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.dmg rename to Library/Homebrew/test/support/fixtures/cask/container.dmg diff --git a/Library/Homebrew/test/fixtures/cask/container.gz b/Library/Homebrew/test/support/fixtures/cask/container.gz similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.gz rename to Library/Homebrew/test/support/fixtures/cask/container.gz diff --git a/Library/Homebrew/test/fixtures/cask/container.lzma b/Library/Homebrew/test/support/fixtures/cask/container.lzma similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.lzma rename to Library/Homebrew/test/support/fixtures/cask/container.lzma diff --git a/Library/Homebrew/test/fixtures/cask/container.pkg b/Library/Homebrew/test/support/fixtures/cask/container.pkg similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.pkg rename to Library/Homebrew/test/support/fixtures/cask/container.pkg diff --git a/Library/Homebrew/test/fixtures/cask/container.rar b/Library/Homebrew/test/support/fixtures/cask/container.rar similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.rar rename to Library/Homebrew/test/support/fixtures/cask/container.rar diff --git a/Library/Homebrew/test/fixtures/cask/container.sit b/Library/Homebrew/test/support/fixtures/cask/container.sit similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.sit rename to Library/Homebrew/test/support/fixtures/cask/container.sit diff --git a/Library/Homebrew/test/fixtures/cask/container.tar.gz b/Library/Homebrew/test/support/fixtures/cask/container.tar.gz similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.tar.gz rename to Library/Homebrew/test/support/fixtures/cask/container.tar.gz diff --git a/Library/Homebrew/test/fixtures/cask/container.xar b/Library/Homebrew/test/support/fixtures/cask/container.xar similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.xar rename to Library/Homebrew/test/support/fixtures/cask/container.xar diff --git a/Library/Homebrew/test/fixtures/cask/container.xz b/Library/Homebrew/test/support/fixtures/cask/container.xz similarity index 100% rename from Library/Homebrew/test/fixtures/cask/container.xz rename to Library/Homebrew/test/support/fixtures/cask/container.xz diff --git a/Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore b/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore similarity index 100% rename from Library/Homebrew/test/fixtures/cask/empty_directory/.gitignore rename to Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore diff --git a/Library/Homebrew/test/fixtures/cask/naked_executable b/Library/Homebrew/test/support/fixtures/cask/naked_executable similarity index 100% rename from Library/Homebrew/test/fixtures/cask/naked_executable rename to Library/Homebrew/test/support/fixtures/cask/naked_executable diff --git a/Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg b/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg similarity index 100% rename from Library/Homebrew/test/fixtures/cask/transmission-2.61.dmg rename to Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg diff --git a/Library/Homebrew/test/mach/a.out b/Library/Homebrew/test/support/fixtures/mach/a.out similarity index 100% rename from Library/Homebrew/test/mach/a.out rename to Library/Homebrew/test/support/fixtures/mach/a.out diff --git a/Library/Homebrew/test/mach/fat.bundle b/Library/Homebrew/test/support/fixtures/mach/fat.bundle similarity index 100% rename from Library/Homebrew/test/mach/fat.bundle rename to Library/Homebrew/test/support/fixtures/mach/fat.bundle diff --git a/Library/Homebrew/test/mach/fat.dylib b/Library/Homebrew/test/support/fixtures/mach/fat.dylib similarity index 100% rename from Library/Homebrew/test/mach/fat.dylib rename to Library/Homebrew/test/support/fixtures/mach/fat.dylib diff --git a/Library/Homebrew/test/mach/i386.bundle b/Library/Homebrew/test/support/fixtures/mach/i386.bundle similarity index 100% rename from Library/Homebrew/test/mach/i386.bundle rename to Library/Homebrew/test/support/fixtures/mach/i386.bundle diff --git a/Library/Homebrew/test/mach/i386.dylib b/Library/Homebrew/test/support/fixtures/mach/i386.dylib similarity index 100% rename from Library/Homebrew/test/mach/i386.dylib rename to Library/Homebrew/test/support/fixtures/mach/i386.dylib diff --git a/Library/Homebrew/test/mach/x86_64.bundle b/Library/Homebrew/test/support/fixtures/mach/x86_64.bundle similarity index 100% rename from Library/Homebrew/test/mach/x86_64.bundle rename to Library/Homebrew/test/support/fixtures/mach/x86_64.bundle diff --git a/Library/Homebrew/test/mach/x86_64.dylib b/Library/Homebrew/test/support/fixtures/mach/x86_64.dylib similarity index 100% rename from Library/Homebrew/test/mach/x86_64.dylib rename to Library/Homebrew/test/support/fixtures/mach/x86_64.dylib diff --git a/Library/Homebrew/test/patches/noop-a.diff b/Library/Homebrew/test/support/fixtures/patches/noop-a.diff similarity index 100% rename from Library/Homebrew/test/patches/noop-a.diff rename to Library/Homebrew/test/support/fixtures/patches/noop-a.diff diff --git a/Library/Homebrew/test/patches/noop-b.diff b/Library/Homebrew/test/support/fixtures/patches/noop-b.diff similarity index 100% rename from Library/Homebrew/test/patches/noop-b.diff rename to Library/Homebrew/test/support/fixtures/patches/noop-b.diff diff --git a/Library/Homebrew/test/patches/noop-c.diff b/Library/Homebrew/test/support/fixtures/patches/noop-c.diff similarity index 100% rename from Library/Homebrew/test/patches/noop-c.diff rename to Library/Homebrew/test/support/fixtures/patches/noop-c.diff diff --git a/Library/Homebrew/test/fixtures/receipt.json b/Library/Homebrew/test/support/fixtures/receipt.json similarity index 100% rename from Library/Homebrew/test/fixtures/receipt.json rename to Library/Homebrew/test/support/fixtures/receipt.json diff --git a/Library/Homebrew/test/fixtures/receipt_old.json b/Library/Homebrew/test/support/fixtures/receipt_old.json similarity index 100% rename from Library/Homebrew/test/fixtures/receipt_old.json rename to Library/Homebrew/test/support/fixtures/receipt_old.json diff --git a/Library/Homebrew/test/tarballs/testball-0.1-patches.tgz b/Library/Homebrew/test/support/fixtures/tarballs/testball-0.1-patches.tgz similarity index 100% rename from Library/Homebrew/test/tarballs/testball-0.1-patches.tgz rename to Library/Homebrew/test/support/fixtures/tarballs/testball-0.1-patches.tgz diff --git a/Library/Homebrew/test/tarballs/testball-0.1.tbz b/Library/Homebrew/test/support/fixtures/tarballs/testball-0.1.tbz similarity index 100% rename from Library/Homebrew/test/tarballs/testball-0.1.tbz rename to Library/Homebrew/test/support/fixtures/tarballs/testball-0.1.tbz diff --git a/Library/Homebrew/test/tarballs/testbottest-0.1.tbz b/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz similarity index 100% rename from Library/Homebrew/test/tarballs/testbottest-0.1.tbz rename to Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz diff --git a/Library/Homebrew/test/fixtures/test.diff b/Library/Homebrew/test/support/fixtures/test.diff similarity index 100% rename from Library/Homebrew/test/fixtures/test.diff rename to Library/Homebrew/test/support/fixtures/test.diff diff --git a/Library/Homebrew/test/fixtures/test.eps b/Library/Homebrew/test/support/fixtures/test.eps similarity index 100% rename from Library/Homebrew/test/fixtures/test.eps rename to Library/Homebrew/test/support/fixtures/test.eps diff --git a/Library/Homebrew/test/fixtures/test.gif b/Library/Homebrew/test/support/fixtures/test.gif similarity index 100% rename from Library/Homebrew/test/fixtures/test.gif rename to Library/Homebrew/test/support/fixtures/test.gif diff --git a/Library/Homebrew/test/fixtures/test.ico b/Library/Homebrew/test/support/fixtures/test.ico similarity index 100% rename from Library/Homebrew/test/fixtures/test.ico rename to Library/Homebrew/test/support/fixtures/test.ico diff --git a/Library/Homebrew/test/fixtures/test.jpg b/Library/Homebrew/test/support/fixtures/test.jpg similarity index 100% rename from Library/Homebrew/test/fixtures/test.jpg rename to Library/Homebrew/test/support/fixtures/test.jpg diff --git a/Library/Homebrew/test/fixtures/test.m4a b/Library/Homebrew/test/support/fixtures/test.m4a similarity index 100% rename from Library/Homebrew/test/fixtures/test.m4a rename to Library/Homebrew/test/support/fixtures/test.m4a diff --git a/Library/Homebrew/test/fixtures/test.mp3 b/Library/Homebrew/test/support/fixtures/test.mp3 similarity index 100% rename from Library/Homebrew/test/fixtures/test.mp3 rename to Library/Homebrew/test/support/fixtures/test.mp3 diff --git a/Library/Homebrew/test/fixtures/test.pcap b/Library/Homebrew/test/support/fixtures/test.pcap similarity index 100% rename from Library/Homebrew/test/fixtures/test.pcap rename to Library/Homebrew/test/support/fixtures/test.pcap diff --git a/Library/Homebrew/test/fixtures/test.pdf b/Library/Homebrew/test/support/fixtures/test.pdf similarity index 100% rename from Library/Homebrew/test/fixtures/test.pdf rename to Library/Homebrew/test/support/fixtures/test.pdf diff --git a/Library/Homebrew/test/fixtures/test.png b/Library/Homebrew/test/support/fixtures/test.png similarity index 100% rename from Library/Homebrew/test/fixtures/test.png rename to Library/Homebrew/test/support/fixtures/test.png diff --git a/Library/Homebrew/test/fixtures/test.ps b/Library/Homebrew/test/support/fixtures/test.ps similarity index 100% rename from Library/Homebrew/test/fixtures/test.ps rename to Library/Homebrew/test/support/fixtures/test.ps diff --git a/Library/Homebrew/test/fixtures/test.svg b/Library/Homebrew/test/support/fixtures/test.svg similarity index 100% rename from Library/Homebrew/test/fixtures/test.svg rename to Library/Homebrew/test/support/fixtures/test.svg diff --git a/Library/Homebrew/test/fixtures/test.tiff b/Library/Homebrew/test/support/fixtures/test.tiff similarity index 100% rename from Library/Homebrew/test/fixtures/test.tiff rename to Library/Homebrew/test/support/fixtures/test.tiff diff --git a/Library/Homebrew/test/fixtures/test.wav b/Library/Homebrew/test/support/fixtures/test.wav similarity index 100% rename from Library/Homebrew/test/fixtures/test.wav rename to Library/Homebrew/test/support/fixtures/test.wav diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/support/fixtures/testball.rb similarity index 78% rename from Library/Homebrew/test/testball.rb rename to Library/Homebrew/test/support/fixtures/testball.rb index cce09738df..ba725f51e1 100644 --- a/Library/Homebrew/test/testball.rb +++ b/Library/Homebrew/test/support/fixtures/testball.rb @@ -1,7 +1,7 @@ class Testball < Formula def initialize(name = "testball", path = Pathname.new(__FILE__).expand_path, spec = :stable, alias_path: nil) self.class.instance_eval do - stable.url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + stable.url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" stable.sha256 TESTBALL_SHA256 end super diff --git a/Library/Homebrew/test/testball_bottle.rb b/Library/Homebrew/test/support/fixtures/testball_bottle.rb similarity index 76% rename from Library/Homebrew/test/testball_bottle.rb rename to Library/Homebrew/test/support/fixtures/testball_bottle.rb index 769f615aad..9453255e6e 100644 --- a/Library/Homebrew/test/testball_bottle.rb +++ b/Library/Homebrew/test/support/fixtures/testball_bottle.rb @@ -1,11 +1,11 @@ class TestballBottle < Formula def initialize(name = "testball_bottle", path = Pathname.new(__FILE__).expand_path, spec = :stable, alias_path: nil) self.class.instance_eval do - stable.url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + stable.url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" stable.sha256 TESTBALL_SHA256 stable.bottle do cellar :any_skip_relocation - root_url "file://#{File.expand_path("..", __FILE__)}/bottles" + root_url "file://#{TEST_FIXTURE_DIR}/bottles" sha256 "9abc8ce779067e26556002c4ca6b9427b9874d25f0cafa7028e05b5c5c410cb4" => Utils::Bottles.tag end cxxstdlib_check :skip diff --git a/Library/Homebrew/test/testbottest.rb b/Library/Homebrew/test/support/fixtures/testbottest.rb similarity index 82% rename from Library/Homebrew/test/testbottest.rb rename to Library/Homebrew/test/support/fixtures/testbottest.rb index f7695cab5b..28b88567e8 100644 --- a/Library/Homebrew/test/testbottest.rb +++ b/Library/Homebrew/test/support/fixtures/testbottest.rb @@ -1,7 +1,7 @@ class Testbottest < Formula desc "Minimal C program and Makefile used for testing Homebrew." homepage "https://github.com/Homebrew/brew" - url "file://#{File.expand_path("..", __FILE__)}/tarballs/testbottest-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testbottest-0.1.tbz" sha256 "78b54d8f31585c9773bed12b4aa4ab2ce458ebd044b9406cb24d40aa5107f082" def install diff --git a/Library/Homebrew/test/fixtures/updater_fixture.yaml b/Library/Homebrew/test/support/fixtures/updater_fixture.yaml similarity index 100% rename from Library/Homebrew/test/fixtures/updater_fixture.yaml rename to Library/Homebrew/test/support/fixtures/updater_fixture.yaml diff --git a/Library/Homebrew/test/helper/env.rb b/Library/Homebrew/test/support/helper/env.rb similarity index 100% rename from Library/Homebrew/test/helper/env.rb rename to Library/Homebrew/test/support/helper/env.rb diff --git a/Library/Homebrew/test/helper/integration_command_test_case.rb b/Library/Homebrew/test/support/helper/integration_command_test_case.rb similarity index 96% rename from Library/Homebrew/test/helper/integration_command_test_case.rb rename to Library/Homebrew/test/support/helper/integration_command_test_case.rb index 2f137e14a3..d7ae674234 100644 --- a/Library/Homebrew/test/helper/integration_command_test_case.rb +++ b/Library/Homebrew/test/support/helper/integration_command_test_case.rb @@ -1,5 +1,4 @@ require "bundler" -require "testing_env" require "fileutils" require "pathname" require "formula" @@ -21,6 +20,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase HOMEBREW_LOCK_DIR.children, HOMEBREW_LOGS.children, HOMEBREW_TEMP.children, + HOMEBREW_PREFIX/".git", HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"share", HOMEBREW_PREFIX/"opt", @@ -59,7 +59,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase env = args.last.is_a?(Hash) ? args.pop : {} cmd_args = %W[ -W0 - -I#{HOMEBREW_LIBRARY_PATH}/test/lib + -I#{HOMEBREW_LIBRARY_PATH}/test/support/lib -rconfig ] if ENV["HOMEBREW_TESTS_COVERAGE"] @@ -125,7 +125,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase content = <<-EOS.undent desc "Some test" homepage "https://example.com/#{name}" - url "file://#{File.expand_path("../..", __FILE__)}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" sha256 "#{TESTBALL_SHA256}" option "with-foo", "Build with foo" @@ -195,6 +195,6 @@ class IntegrationCommandTestCase < Homebrew::TestCase end def testball - "#{File.expand_path("../..", __FILE__)}/testball.rb" + "#{TEST_FIXTURE_DIR}/testball.rb" end end diff --git a/Library/Homebrew/test/helper/shutup.rb b/Library/Homebrew/test/support/helper/shutup.rb similarity index 100% rename from Library/Homebrew/test/helper/shutup.rb rename to Library/Homebrew/test/support/helper/shutup.rb diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/support/lib/config.rb similarity index 95% rename from Library/Homebrew/test/lib/config.rb rename to Library/Homebrew/test/support/lib/config.rb index 4fe62d4090..f6fdb4ecbf 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/support/lib/config.rb @@ -14,7 +14,7 @@ TEST_TMPDIR = ENV.fetch("HOMEBREW_TEST_TMPDIR") do |k| end # Paths pointing into the Homebrew code base that persist across test runs -HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../..", __FILE__)) +HOMEBREW_LIBRARY_PATH = Pathname.new(File.expand_path("../../../..", __FILE__)) HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY_PATH.parent+"Homebrew/shims" HOMEBREW_LOAD_PATH = [File.expand_path("..", __FILE__), HOMEBREW_LIBRARY_PATH].join(":") @@ -31,7 +31,7 @@ HOMEBREW_CELLAR = HOMEBREW_PREFIX.parent+"cellar" HOMEBREW_LOGS = HOMEBREW_PREFIX.parent+"logs" HOMEBREW_TEMP = HOMEBREW_PREFIX.parent+"temp" -TEST_FIXTURE_DIR = HOMEBREW_LIBRARY_PATH.join("test", "fixtures") +TEST_FIXTURE_DIR = HOMEBREW_LIBRARY_PATH.join("test", "support", "fixtures") TESTBALL_SHA1 = "be478fd8a80fe7f29196d6400326ac91dad68c37".freeze TESTBALL_SHA256 = "91e3f7930c98d7ccfb288e115ed52d06b0e5bc16fec7dce8bdda86530027067b".freeze diff --git a/Library/Homebrew/test/lib/integration_mocks.rb b/Library/Homebrew/test/support/lib/integration_mocks.rb similarity index 100% rename from Library/Homebrew/test/lib/integration_mocks.rb rename to Library/Homebrew/test/support/lib/integration_mocks.rb diff --git a/Library/Homebrew/test/test/ENV_test.rb b/Library/Homebrew/test/test/ENV_test.rb index e38c75c6e4..1736d34af5 100644 --- a/Library/Homebrew/test/test/ENV_test.rb +++ b/Library/Homebrew/test/test/ENV_test.rb @@ -1,6 +1,7 @@ require "testing_env" require "extend/ENV" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestEnv < IntegrationCommandTestCase def test_env diff --git a/Library/Homebrew/test/test/analytics_test.rb b/Library/Homebrew/test/test/analytics_test.rb index 00e0593db4..266c5bd098 100644 --- a/Library/Homebrew/test/test/analytics_test.rb +++ b/Library/Homebrew/test/test/analytics_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestAnalytics < IntegrationCommandTestCase def test_analytics diff --git a/Library/Homebrew/test/test/bottle_test.rb b/Library/Homebrew/test/test/bottle_test.rb index 48727cfd90..5fdba0af82 100644 --- a/Library/Homebrew/test/test/bottle_test.rb +++ b/Library/Homebrew/test/test/bottle_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestBottle < IntegrationCommandTestCase def test_bottle diff --git a/Library/Homebrew/test/test/bundle_test.rb b/Library/Homebrew/test/test/bundle_test.rb index 6b040df1db..ea18d5f843 100644 --- a/Library/Homebrew/test/test/bundle_test.rb +++ b/Library/Homebrew/test/test/bundle_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestBundle < IntegrationCommandTestCase def test_bundle diff --git a/Library/Homebrew/test/test/cache_formula_test.rb b/Library/Homebrew/test/test/cache_formula_test.rb index f4e37e2a2e..c64ce9809a 100644 --- a/Library/Homebrew/test/test/cache_formula_test.rb +++ b/Library/Homebrew/test/test/cache_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCacheFormula < IntegrationCommandTestCase def test_cache_formula diff --git a/Library/Homebrew/test/test/cache_test.rb b/Library/Homebrew/test/test/cache_test.rb index cd7a5e2fab..f8c0356761 100644 --- a/Library/Homebrew/test/test/cache_test.rb +++ b/Library/Homebrew/test/test/cache_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCache < IntegrationCommandTestCase def test_cache diff --git a/Library/Homebrew/test/test/cask_test.rb b/Library/Homebrew/test/test/cask_test.rb index 6cae6d54ba..ad7a2a0a0e 100644 --- a/Library/Homebrew/test/test/cask_test.rb +++ b/Library/Homebrew/test/test/cask_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCask < IntegrationCommandTestCase def test_cask diff --git a/Library/Homebrew/test/test/cat_test.rb b/Library/Homebrew/test/test/cat_test.rb index 4cfd19c3dc..df64188d6c 100644 --- a/Library/Homebrew/test/test/cat_test.rb +++ b/Library/Homebrew/test/test/cat_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCat < IntegrationCommandTestCase def test_cat diff --git a/Library/Homebrew/test/test/cellar_formula_test.rb b/Library/Homebrew/test/test/cellar_formula_test.rb index 7c458be9d0..6c3063ca3b 100644 --- a/Library/Homebrew/test/test/cellar_formula_test.rb +++ b/Library/Homebrew/test/test/cellar_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCellarFormula < IntegrationCommandTestCase def test_cellar_formula diff --git a/Library/Homebrew/test/test/cellar_test.rb b/Library/Homebrew/test/test/cellar_test.rb index b793c53424..32cdb1af50 100644 --- a/Library/Homebrew/test/test/cellar_test.rb +++ b/Library/Homebrew/test/test/cellar_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCellar < IntegrationCommandTestCase def test_cellar diff --git a/Library/Homebrew/test/test/checksum_verification_test.rb b/Library/Homebrew/test/test/checksum_verification_test.rb index e25d08b833..9017b528d0 100644 --- a/Library/Homebrew/test/test/checksum_verification_test.rb +++ b/Library/Homebrew/test/test/checksum_verification_test.rb @@ -12,7 +12,7 @@ class ChecksumVerificationTests < Homebrew::TestCase def formula(&block) super do - url "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" instance_eval(&block) end end diff --git a/Library/Homebrew/test/test/cleaner_test.rb b/Library/Homebrew/test/test/cleaner_test.rb index 450a78d86a..ac108421c8 100644 --- a/Library/Homebrew/test/test/cleaner_test.rb +++ b/Library/Homebrew/test/test/cleaner_test.rb @@ -17,8 +17,8 @@ class CleanerTests < Homebrew::TestCase def test_clean_file @f.bin.mkpath @f.lib.mkpath - cp "#{TEST_DIRECTORY}/mach/a.out", @f.bin - cp Dir["#{TEST_DIRECTORY}/mach/*.dylib"], @f.lib + cp "#{TEST_FIXTURE_DIR}/mach/a.out", @f.bin + cp Dir["#{TEST_FIXTURE_DIR}/mach/*.dylib"], @f.lib Cleaner.new(@f).clean diff --git a/Library/Homebrew/test/test/cleanup_test.rb b/Library/Homebrew/test/test/cleanup_test.rb index dffcd12f2f..fef249fcba 100644 --- a/Library/Homebrew/test/test/cleanup_test.rb +++ b/Library/Homebrew/test/test/cleanup_test.rb @@ -1,9 +1,10 @@ require "testing_env" -require "testball" +require "test/support/fixtures/testball" require "cleanup" require "fileutils" require "pathname" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCleanup < IntegrationCommandTestCase def test_cleanup diff --git a/Library/Homebrew/test/test/command_test.rb b/Library/Homebrew/test/test/command_test.rb index d051846313..620a014b91 100644 --- a/Library/Homebrew/test/test/command_test.rb +++ b/Library/Homebrew/test/test/command_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCommand < IntegrationCommandTestCase def test_command diff --git a/Library/Homebrew/test/test/commands_test.rb b/Library/Homebrew/test/test/commands_test.rb index ef138049c1..cbb446ae3d 100644 --- a/Library/Homebrew/test/test/commands_test.rb +++ b/Library/Homebrew/test/test/commands_test.rb @@ -2,7 +2,8 @@ require "testing_env" require "cmd/command" require "cmd/commands" require "fileutils" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCommands < IntegrationCommandTestCase def test_commands diff --git a/Library/Homebrew/test/test/config_test.rb b/Library/Homebrew/test/test/config_test.rb index 33a2937357..1a793cc6be 100644 --- a/Library/Homebrew/test/test/config_test.rb +++ b/Library/Homebrew/test/test/config_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestConfig < IntegrationCommandTestCase def test_config diff --git a/Library/Homebrew/test/test/create_test.rb b/Library/Homebrew/test/test/create_test.rb index 5f194ea023..26a325a22f 100644 --- a/Library/Homebrew/test/test/create_test.rb +++ b/Library/Homebrew/test/test/create_test.rb @@ -1,8 +1,9 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCreate < IntegrationCommandTestCase def test_create - url = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz" + url = "file://#{TEST_FIXTURE_DIR}/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_test.rb b/Library/Homebrew/test/test/custom_command_test.rb index bc27e2121e..71bfafd9b5 100644 --- a/Library/Homebrew/test/test/custom_command_test.rb +++ b/Library/Homebrew/test/test/custom_command_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCustomCommand < IntegrationCommandTestCase def test_custom_command diff --git a/Library/Homebrew/test/test/deps_test.rb b/Library/Homebrew/test/test/deps_test.rb index 83cc9aa6a7..44803af5e5 100644 --- a/Library/Homebrew/test/test/deps_test.rb +++ b/Library/Homebrew/test/test/deps_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDeps < IntegrationCommandTestCase def test_deps diff --git a/Library/Homebrew/test/test/desc_test.rb b/Library/Homebrew/test/test/desc_test.rb index 075ea991a2..7428c07924 100644 --- a/Library/Homebrew/test/test/desc_test.rb +++ b/Library/Homebrew/test/test/desc_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDesc < IntegrationCommandTestCase def test_desc diff --git a/Library/Homebrew/test/test/doctor_test.rb b/Library/Homebrew/test/test/doctor_test.rb index ccb909dce0..be1098d22b 100644 --- a/Library/Homebrew/test/test/doctor_test.rb +++ b/Library/Homebrew/test/test/doctor_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDoctor < IntegrationCommandTestCase def test_doctor diff --git a/Library/Homebrew/test/test/edit_test.rb b/Library/Homebrew/test/test/edit_test.rb index 8d14371730..c78db3bd80 100644 --- a/Library/Homebrew/test/test/edit_test.rb +++ b/Library/Homebrew/test/test/edit_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestEdit < IntegrationCommandTestCase def test_edit diff --git a/Library/Homebrew/test/test/fetch_test.rb b/Library/Homebrew/test/test/fetch_test.rb index 7b57c62469..e049db5541 100644 --- a/Library/Homebrew/test/test/fetch_test.rb +++ b/Library/Homebrew/test/test/fetch_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestFetch < IntegrationCommandTestCase def test_fetch diff --git a/Library/Homebrew/test/test/formula_installer_bottle_test.rb b/Library/Homebrew/test/test/formula_installer_bottle_test.rb index d83c856b7f..6a891f1591 100644 --- a/Library/Homebrew/test/test/formula_installer_bottle_test.rb +++ b/Library/Homebrew/test/test/formula_installer_bottle_test.rb @@ -3,8 +3,8 @@ require "formula" require "formula_installer" require "keg" require "tab" -require "testball" -require "testball_bottle" +require "test/support/fixtures/testball" +require "test/support/fixtures/testball_bottle" class InstallBottleTests < Homebrew::TestCase def temporary_bottle_install(formula) diff --git a/Library/Homebrew/test/test/formula_installer_test.rb b/Library/Homebrew/test/test/formula_installer_test.rb index 18bd910a67..652548bd78 100644 --- a/Library/Homebrew/test/test/formula_installer_test.rb +++ b/Library/Homebrew/test/test/formula_installer_test.rb @@ -3,8 +3,8 @@ require "formula" require "formula_installer" require "keg" require "tab" -require "testball" -require "testball_bottle" +require "test/support/fixtures/testball" +require "test/support/fixtures/testball_bottle" class InstallTests < Homebrew::TestCase def temporary_install(formula) diff --git a/Library/Homebrew/test/test/formula_test.rb b/Library/Homebrew/test/test/formula_test.rb index 4aa8355909..eef60a3e5f 100644 --- a/Library/Homebrew/test/test/formula_test.rb +++ b/Library/Homebrew/test/test/formula_test.rb @@ -1,5 +1,5 @@ require "testing_env" -require "testball" +require "test/support/fixtures/testball" require "formula" class FormulaTests < Homebrew::TestCase diff --git a/Library/Homebrew/test/test/formulary_test.rb b/Library/Homebrew/test/test/formulary_test.rb index 690ff089a7..3d88c84077 100644 --- a/Library/Homebrew/test/test/formulary_test.rb +++ b/Library/Homebrew/test/test/formulary_test.rb @@ -18,11 +18,11 @@ class FormularyFactoryTest < Homebrew::TestCase def setup @name = "testball_bottle" @path = CoreTap.new.formula_dir/"#{@name}.rb" - @bottle_dir = Pathname.new("#{TEST_DIRECTORY}/bottles") + @bottle_dir = Pathname.new("#{TEST_FIXTURE_DIR}/bottles") @bottle = @bottle_dir/"testball_bottle-0.1.#{Utils::Bottles.tag}.bottle.tar.gz" @path.write <<-EOS.undent class #{Formulary.class_s(@name)} < Formula - url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" sha256 TESTBALL_SHA256 bottle do diff --git a/Library/Homebrew/test/test/help_test.rb b/Library/Homebrew/test/test/help_test.rb index 9c14f9b78f..8c9a4bb081 100644 --- a/Library/Homebrew/test/test/help_test.rb +++ b/Library/Homebrew/test/test/help_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestHelp < IntegrationCommandTestCase def test_help diff --git a/Library/Homebrew/test/test/home_test.rb b/Library/Homebrew/test/test/home_test.rb index 9c26353bec..9116442b7b 100644 --- a/Library/Homebrew/test/test/home_test.rb +++ b/Library/Homebrew/test/test/home_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestHome < IntegrationCommandTestCase def test_home diff --git a/Library/Homebrew/test/test/info_test.rb b/Library/Homebrew/test/test/info_test.rb index 35f9183e13..a4186a5e9a 100644 --- a/Library/Homebrew/test/test/info_test.rb +++ b/Library/Homebrew/test/test/info_test.rb @@ -1,7 +1,8 @@ require "testing_env" require "cmd/info" require "formula" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestInfo < IntegrationCommandTestCase def test_info diff --git a/Library/Homebrew/test/test/install_test.rb b/Library/Homebrew/test/test/install_test.rb index 7135dddb2d..3131259311 100644 --- a/Library/Homebrew/test/test/install_test.rb +++ b/Library/Homebrew/test/test/install_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestInstall < IntegrationCommandTestCase def test_install diff --git a/Library/Homebrew/test/test/irb_test.rb b/Library/Homebrew/test/test/irb_test.rb index bf35b65241..77ca4a90db 100644 --- a/Library/Homebrew/test/test/irb_test.rb +++ b/Library/Homebrew/test/test/irb_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestIrb < IntegrationCommandTestCase def test_irb diff --git a/Library/Homebrew/test/test/leaves_test.rb b/Library/Homebrew/test/test/leaves_test.rb index 2a9bbadd97..ef25a4b6eb 100644 --- a/Library/Homebrew/test/test/leaves_test.rb +++ b/Library/Homebrew/test/test/leaves_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLeaves < IntegrationCommandTestCase def test_leaves diff --git a/Library/Homebrew/test/test/link_test.rb b/Library/Homebrew/test/test/link_test.rb index 3f05070724..ecabe0c675 100644 --- a/Library/Homebrew/test/test/link_test.rb +++ b/Library/Homebrew/test/test/link_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLink < IntegrationCommandTestCase def test_link diff --git a/Library/Homebrew/test/test/linkapps_test.rb b/Library/Homebrew/test/test/linkapps_test.rb index b7c4cb8114..a0b33a543d 100644 --- a/Library/Homebrew/test/test/linkapps_test.rb +++ b/Library/Homebrew/test/test/linkapps_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLinkapps < IntegrationCommandTestCase def test_linkapps diff --git a/Library/Homebrew/test/test/list_test.rb b/Library/Homebrew/test/test/list_test.rb index 1ffdb45286..26aab741f4 100644 --- a/Library/Homebrew/test/test/list_test.rb +++ b/Library/Homebrew/test/test/list_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestList < IntegrationCommandTestCase def test_list diff --git a/Library/Homebrew/test/test/log_formula_test.rb b/Library/Homebrew/test/test/log_formula_test.rb index 34509bf72b..26c10d3812 100644 --- a/Library/Homebrew/test/test/log_formula_test.rb +++ b/Library/Homebrew/test/test/log_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLogFormula < IntegrationCommandTestCase def test_log_formula diff --git a/Library/Homebrew/test/test/log_test.rb b/Library/Homebrew/test/test/log_test.rb index b20a098fd8..c9eb73d978 100644 --- a/Library/Homebrew/test/test/log_test.rb +++ b/Library/Homebrew/test/test/log_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLog < IntegrationCommandTestCase def test_log diff --git a/Library/Homebrew/test/test/migrate_test.rb b/Library/Homebrew/test/test/migrate_test.rb index 53b32777a3..c267629a31 100644 --- a/Library/Homebrew/test/test/migrate_test.rb +++ b/Library/Homebrew/test/test/migrate_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestMigrate < IntegrationCommandTestCase def test_migrate diff --git a/Library/Homebrew/test/test/migrator_test.rb b/Library/Homebrew/test/test/migrator_test.rb index cefb8b7a34..8a2b6ad63e 100644 --- a/Library/Homebrew/test/test/migrator_test.rb +++ b/Library/Homebrew/test/test/migrator_test.rb @@ -1,6 +1,6 @@ require "testing_env" require "migrator" -require "testball" +require "test/support/fixtures/testball" require "tab" require "keg" diff --git a/Library/Homebrew/test/test/missing_test.rb b/Library/Homebrew/test/test/missing_test.rb index 565f413daf..9ad0ab0b8c 100644 --- a/Library/Homebrew/test/test/missing_test.rb +++ b/Library/Homebrew/test/test/missing_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestMissing < IntegrationCommandTestCase def setup diff --git a/Library/Homebrew/test/test/options_test.rb b/Library/Homebrew/test/test/options_test.rb index bfde7a9b64..43ea26b97e 100644 --- a/Library/Homebrew/test/test/options_test.rb +++ b/Library/Homebrew/test/test/options_test.rb @@ -1,6 +1,7 @@ require "testing_env" require "options" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestOptions < IntegrationCommandTestCase def test_options diff --git a/Library/Homebrew/test/test/os/mac/mach_test.rb b/Library/Homebrew/test/test/os/mac/mach_test.rb index 404a21d603..a42f7316b1 100644 --- a/Library/Homebrew/test/test/os/mac/mach_test.rb +++ b/Library/Homebrew/test/test/os/mac/mach_test.rb @@ -41,7 +41,7 @@ class MachOPathnameTests < Homebrew::TestCase end def test_mach_o_executable - pn = Pathname.new("#{TEST_DIRECTORY}/mach/a.out") + pn = Pathname.new("#{TEST_FIXTURE_DIR}/mach/a.out") assert_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? @@ -93,7 +93,7 @@ class MachOPathnameTests < Homebrew::TestCase end def test_non_mach_o - pn = Pathname.new("#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz") + pn = Pathname.new("#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz") refute_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? diff --git a/Library/Homebrew/test/test/outdated_test.rb b/Library/Homebrew/test/test/outdated_test.rb index cc0f024c8d..03c2293d8c 100644 --- a/Library/Homebrew/test/test/outdated_test.rb +++ b/Library/Homebrew/test/test/outdated_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestOutdated < IntegrationCommandTestCase def test_outdated diff --git a/Library/Homebrew/test/test/patching_test.rb b/Library/Homebrew/test/test/patching_test.rb index 18b848b10e..ac14c8e1e7 100644 --- a/Library/Homebrew/test/test/patching_test.rb +++ b/Library/Homebrew/test/test/patching_test.rb @@ -2,12 +2,12 @@ require "testing_env" require "formula" class PatchingTests < Homebrew::TestCase - TESTBALL_URL = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz".freeze - TESTBALL_PATCHES_URL = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1-patches.tgz".freeze - PATCH_URL_A = "file://#{TEST_DIRECTORY}/patches/noop-a.diff".freeze - PATCH_URL_B = "file://#{TEST_DIRECTORY}/patches/noop-b.diff".freeze - PATCH_A_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-a.diff" - PATCH_B_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-b.diff" + TESTBALL_URL = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz".freeze + TESTBALL_PATCHES_URL = "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1-patches.tgz".freeze + PATCH_URL_A = "file://#{TEST_FIXTURE_DIR}/patches/noop-a.diff".freeze + PATCH_URL_B = "file://#{TEST_FIXTURE_DIR}/patches/noop-b.diff".freeze + PATCH_A_CONTENTS = File.read "#{TEST_FIXTURE_DIR}/patches/noop-a.diff" + PATCH_B_CONTENTS = File.read "#{TEST_FIXTURE_DIR}/patches/noop-b.diff" APPLY_A = "noop-a.diff".freeze APPLY_B = "noop-b.diff".freeze APPLY_C = "noop-c.diff".freeze diff --git a/Library/Homebrew/test/test/pin_unpin_test.rb b/Library/Homebrew/test/test/pin_unpin_test.rb index 37682d45ee..9603620a30 100644 --- a/Library/Homebrew/test/test/pin_unpin_test.rb +++ b/Library/Homebrew/test/test/pin_unpin_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPinUnpin < IntegrationCommandTestCase def test_pin_unpin diff --git a/Library/Homebrew/test/test/prefix_formula_test.rb b/Library/Homebrew/test/test/prefix_formula_test.rb index d76a966d73..e51de2b6f0 100644 --- a/Library/Homebrew/test/test/prefix_formula_test.rb +++ b/Library/Homebrew/test/test/prefix_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrefixFormula < IntegrationCommandTestCase def test_prefix_formula diff --git a/Library/Homebrew/test/test/prefix_test.rb b/Library/Homebrew/test/test/prefix_test.rb index 4aa63fa071..1b21148078 100644 --- a/Library/Homebrew/test/test/prefix_test.rb +++ b/Library/Homebrew/test/test/prefix_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrefix < IntegrationCommandTestCase def test_prefix diff --git a/Library/Homebrew/test/test/prune_test.rb b/Library/Homebrew/test/test/prune_test.rb index 293a3746dd..b810621123 100644 --- a/Library/Homebrew/test/test/prune_test.rb +++ b/Library/Homebrew/test/test/prune_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrune < IntegrationCommandTestCase def test_prune diff --git a/Library/Homebrew/test/test/pull_offline_test.rb b/Library/Homebrew/test/test/pull_offline_test.rb index 2716af346d..1429ca62e3 100644 --- a/Library/Homebrew/test/test/pull_offline_test.rb +++ b/Library/Homebrew/test/test/pull_offline_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPullOffline < IntegrationCommandTestCase def test_pull_offline diff --git a/Library/Homebrew/test/test/pull_test.rb b/Library/Homebrew/test/test/pull_test.rb index 9707ff8a82..f772454bab 100644 --- a/Library/Homebrew/test/test/pull_test.rb +++ b/Library/Homebrew/test/test/pull_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPull < IntegrationCommandTestCase def test_pull diff --git a/Library/Homebrew/test/test/readall_test.rb b/Library/Homebrew/test/test/readall_test.rb index d0c078e493..cbb304ca1b 100644 --- a/Library/Homebrew/test/test/readall_test.rb +++ b/Library/Homebrew/test/test/readall_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReadall < IntegrationCommandTestCase def test_readall diff --git a/Library/Homebrew/test/test/reinstall_pinned_test.rb b/Library/Homebrew/test/test/reinstall_pinned_test.rb index c9cb8a849f..36f5cfd74b 100644 --- a/Library/Homebrew/test/test/reinstall_pinned_test.rb +++ b/Library/Homebrew/test/test/reinstall_pinned_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReinstallPinned < IntegrationCommandTestCase def test_reinstall_pinned diff --git a/Library/Homebrew/test/test/reinstall_test.rb b/Library/Homebrew/test/test/reinstall_test.rb index d07a960517..5018301027 100644 --- a/Library/Homebrew/test/test/reinstall_test.rb +++ b/Library/Homebrew/test/test/reinstall_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReinstall < IntegrationCommandTestCase def test_reinstall diff --git a/Library/Homebrew/test/test/repository_test.rb b/Library/Homebrew/test/test/repository_test.rb index 2029876ad7..352ab1d42b 100644 --- a/Library/Homebrew/test/test/repository_test.rb +++ b/Library/Homebrew/test/test/repository_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestRepository < IntegrationCommandTestCase def test_repository diff --git a/Library/Homebrew/test/test/search_test.rb b/Library/Homebrew/test/test/search_test.rb index 8310d1c2b2..95e555bf24 100644 --- a/Library/Homebrew/test/test/search_test.rb +++ b/Library/Homebrew/test/test/search_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSearch < IntegrationCommandTestCase def test_search diff --git a/Library/Homebrew/test/test/services_test.rb b/Library/Homebrew/test/test/services_test.rb index b5ccb7c778..94fba4675f 100644 --- a/Library/Homebrew/test/test/services_test.rb +++ b/Library/Homebrew/test/test/services_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestServices < IntegrationCommandTestCase def test_services diff --git a/Library/Homebrew/test/test/sh_test.rb b/Library/Homebrew/test/test/sh_test.rb index 449b7b5b3e..67593b17e4 100644 --- a/Library/Homebrew/test/test/sh_test.rb +++ b/Library/Homebrew/test/test/sh_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSh < IntegrationCommandTestCase def test_sh diff --git a/Library/Homebrew/test/test/switch_test.rb b/Library/Homebrew/test/test/switch_test.rb index 88fdf85b98..766d244940 100644 --- a/Library/Homebrew/test/test/switch_test.rb +++ b/Library/Homebrew/test/test/switch_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSwitch < IntegrationCommandTestCase def test_switch diff --git a/Library/Homebrew/test/test/tab_test.rb b/Library/Homebrew/test/test/tab_test.rb index 2c756cf685..76c9aacc9f 100644 --- a/Library/Homebrew/test/test/tab_test.rb +++ b/Library/Homebrew/test/test/tab_test.rb @@ -218,7 +218,7 @@ class TabLoadingTests < Homebrew::TestCase @f = formula { url "foo-1.0" } @f.prefix.mkpath @path = @f.prefix.join(Tab::FILENAME) - @path.write Pathname.new(TEST_DIRECTORY).join("fixtures", "receipt.json").read + @path.write TEST_FIXTURE_DIR.join("receipt.json").read end def teardown diff --git a/Library/Homebrew/test/test/tap_new_test.rb b/Library/Homebrew/test/test/tap_new_test.rb index 636024b0aa..57ad4a08e2 100644 --- a/Library/Homebrew/test/test/tap_new_test.rb +++ b/Library/Homebrew/test/test/tap_new_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTapNew < IntegrationCommandTestCase def test_tap_readme diff --git a/Library/Homebrew/test/test/tap_test.rb b/Library/Homebrew/test/test/tap_test.rb index 71836aee94..94597cdb3f 100644 --- a/Library/Homebrew/test/test/tap_test.rb +++ b/Library/Homebrew/test/test/tap_test.rb @@ -1,5 +1,6 @@ require "testing_env" -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTap < IntegrationCommandTestCase def test_tap diff --git a/Library/Homebrew/test/test/test_formula_test.rb b/Library/Homebrew/test/test/test_formula_test.rb index b3889d6a2f..cab4db7409 100644 --- a/Library/Homebrew/test/test/test_formula_test.rb +++ b/Library/Homebrew/test/test/test_formula_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTestFormula < IntegrationCommandTestCase def test_test_formula @@ -13,7 +14,7 @@ class IntegrationCommandTestTestFormula < IntegrationCommandTestCase head "https://github.com/example/testball2.git" devel do - url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" + url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz" sha256 "#{TESTBALL_SHA256}" end diff --git a/Library/Homebrew/test/test/uninstall_test.rb b/Library/Homebrew/test/test/uninstall_test.rb index d86db0e805..ffc6f0db7a 100644 --- a/Library/Homebrew/test/test/uninstall_test.rb +++ b/Library/Homebrew/test/test/uninstall_test.rb @@ -1,4 +1,4 @@ -require "helper/integration_command_test_case" +require "test/support/helper/integration_command_test_case" require "cmd/uninstall" class UninstallTests < Homebrew::TestCase diff --git a/Library/Homebrew/test/test/unlink_test.rb b/Library/Homebrew/test/test/unlink_test.rb index 091bd8c45b..a307dc638b 100644 --- a/Library/Homebrew/test/test/unlink_test.rb +++ b/Library/Homebrew/test/test/unlink_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnlink < IntegrationCommandTestCase def test_unlink diff --git a/Library/Homebrew/test/test/unlinkapps_test.rb b/Library/Homebrew/test/test/unlinkapps_test.rb index 2de4e3ff8a..2dbbd84e91 100644 --- a/Library/Homebrew/test/test/unlinkapps_test.rb +++ b/Library/Homebrew/test/test/unlinkapps_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnlinkapps < IntegrationCommandTestCase def test_unlinkapps diff --git a/Library/Homebrew/test/test/unpack_test.rb b/Library/Homebrew/test/test/unpack_test.rb index de1452a297..e044e713ba 100644 --- a/Library/Homebrew/test/test/unpack_test.rb +++ b/Library/Homebrew/test/test/unpack_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnpack < IntegrationCommandTestCase def test_unpack diff --git a/Library/Homebrew/test/test/upgrade_test.rb b/Library/Homebrew/test/test/upgrade_test.rb index 73618293bc..7c74ca70e2 100644 --- a/Library/Homebrew/test/test/upgrade_test.rb +++ b/Library/Homebrew/test/test/upgrade_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUpgrade < IntegrationCommandTestCase def test_upgrade diff --git a/Library/Homebrew/test/test/uses_test.rb b/Library/Homebrew/test/test/uses_test.rb index b0e79ef2d8..494ce4d6e8 100644 --- a/Library/Homebrew/test/test/uses_test.rb +++ b/Library/Homebrew/test/test/uses_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUses < IntegrationCommandTestCase def test_uses diff --git a/Library/Homebrew/test/test/version_test.rb b/Library/Homebrew/test/test/version_test.rb index ca37e3567a..a783eda690 100644 --- a/Library/Homebrew/test/test/version_test.rb +++ b/Library/Homebrew/test/test/version_test.rb @@ -1,4 +1,5 @@ -require "helper/integration_command_test_case" +require "testing_env" +require "test/support/helper/integration_command_test_case" class IntegrationCommandTestVersion < IntegrationCommandTestCase def test_version diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index d441b4f1c8..76b943164b 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -1,5 +1,5 @@ $:.unshift File.expand_path("../..", __FILE__) -$:.unshift File.expand_path("../lib", __FILE__) +$:.unshift File.expand_path("../support/lib", __FILE__) require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"] require "global" @@ -9,9 +9,6 @@ require "formulary" (HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-core/Formula").mkpath %w[cache formula_cache locks cellar logs temp].each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } -# Test fixtures and files can be found relative to this path -TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__)) - begin require "rubygems" require "minitest/autorun" @@ -43,7 +40,9 @@ module Homebrew module FSLeakLogger def self.included(klass) require "find" - @@log = File.open(HOMEBREW_LIBRARY_PATH/"tmp/fs_leak.log", "w") + logdir = HOMEBREW_LIBRARY_PATH.join("tmp") + logdir.mkdir unless logdir.directory? + @@log = File.open(logdir.join("fs_leak.log"), "w") klass.make_my_diffs_pretty! end @@ -63,8 +62,8 @@ module Homebrew end class TestCase < ::Minitest::Test - require "test/helper/env" - require "test/helper/shutup" + require "test/support/helper/env" + require "test/support/helper/shutup" include Test::Helper::Env include Test::Helper::Shutup @@ -107,11 +106,11 @@ module Homebrew end def dylib_path(name) - Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.dylib") + Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.dylib") end def bundle_path(name) - Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.bundle") + Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.bundle") end # Use a stubbed {Formulary::FormulaLoader} to make a given formula be found From 7b9fd538fabf450203c0120f996403e24bd02071 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Mon, 7 Nov 2016 00:01:57 +0100 Subject: [PATCH 5/8] Move `integration_mocks` to `test/support/helper`. --- .../test/support/helper/integration_command_test_case.rb | 3 ++- .../Homebrew/test/support/{lib => helper}/integration_mocks.rb | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename Library/Homebrew/test/support/{lib => helper}/integration_mocks.rb (100%) diff --git a/Library/Homebrew/test/support/helper/integration_command_test_case.rb b/Library/Homebrew/test/support/helper/integration_command_test_case.rb index d7ae674234..9306617eb8 100644 --- a/Library/Homebrew/test/support/helper/integration_command_test_case.rb +++ b/Library/Homebrew/test/support/helper/integration_command_test_case.rb @@ -60,6 +60,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase cmd_args = %W[ -W0 -I#{HOMEBREW_LIBRARY_PATH}/test/support/lib + -I#{HOMEBREW_LIBRARY_PATH} -rconfig ] if ENV["HOMEBREW_TESTS_COVERAGE"] @@ -70,7 +71,7 @@ class IntegrationCommandTestCase < Homebrew::TestCase cmd_args << "-rbundler/setup" cmd_args << "-rsimplecov" end - cmd_args << "-rintegration_mocks" + cmd_args << "-rtest/support/helper/integration_mocks" cmd_args << (HOMEBREW_LIBRARY_PATH/"brew.rb").resolved_path.to_s cmd_args += args developer = ENV["HOMEBREW_DEVELOPER"] diff --git a/Library/Homebrew/test/support/lib/integration_mocks.rb b/Library/Homebrew/test/support/helper/integration_mocks.rb similarity index 100% rename from Library/Homebrew/test/support/lib/integration_mocks.rb rename to Library/Homebrew/test/support/helper/integration_mocks.rb From 9d82acbf30e9a5d0eb06be9726803d362e2fa91e Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 13 Nov 2016 21:31:53 +0100 Subject: [PATCH 6/8] Separate `Homebrew::TestCase` from `testing_env`. --- Library/Homebrew/.rubocop_todo.yml | 2 +- .../test/support/helper/fs_leak_logger.rb | 27 +++++ .../Homebrew/test/support/helper/test_case.rb | 64 +++++++++++ .../test/support/helper/version_assertions.rb | 23 ++++ Library/Homebrew/test/testing_env.rb | 107 +----------------- 5 files changed, 116 insertions(+), 107 deletions(-) create mode 100644 Library/Homebrew/test/support/helper/fs_leak_logger.rb create mode 100644 Library/Homebrew/test/support/helper/test_case.rb create mode 100644 Library/Homebrew/test/support/helper/version_assertions.rb diff --git a/Library/Homebrew/.rubocop_todo.yml b/Library/Homebrew/.rubocop_todo.yml index 9e48c6792f..3705170fdc 100644 --- a/Library/Homebrew/.rubocop_todo.yml +++ b/Library/Homebrew/.rubocop_todo.yml @@ -90,7 +90,7 @@ Style/ClassVars: Exclude: - 'dev-cmd/audit.rb' - 'formula_installer.rb' - - 'test/testing_env.rb' + - 'test/support/helper/fs_leak_logger.rb' # Offense count: 13 # Configuration parameters: AllowedVariables. diff --git a/Library/Homebrew/test/support/helper/fs_leak_logger.rb b/Library/Homebrew/test/support/helper/fs_leak_logger.rb new file mode 100644 index 0000000000..f6a02dbc04 --- /dev/null +++ b/Library/Homebrew/test/support/helper/fs_leak_logger.rb @@ -0,0 +1,27 @@ +module Test + module Helper + module FSLeakLogger + def self.included(klass) + require "find" + logdir = HOMEBREW_LIBRARY_PATH.join("tmp") + logdir.mkdir unless logdir.directory? + @@log = File.open(logdir.join("fs_leak.log"), "w") + klass.make_my_diffs_pretty! + end + + def before_setup + @__files_before_test = [] + Find.find(TEST_TMPDIR) { |f| @__files_before_test << f.sub(TEST_TMPDIR, "") } + super + end + + def after_teardown + super + files_after_test = [] + Find.find(TEST_TMPDIR) { |f| files_after_test << f.sub(TEST_TMPDIR, "") } + return if @__files_before_test == files_after_test + @@log.puts location, diff(@__files_before_test, files_after_test) + end + end + end +end diff --git a/Library/Homebrew/test/support/helper/test_case.rb b/Library/Homebrew/test/support/helper/test_case.rb new file mode 100644 index 0000000000..60c91e7bb3 --- /dev/null +++ b/Library/Homebrew/test/support/helper/test_case.rb @@ -0,0 +1,64 @@ +module Homebrew + class TestCase < ::Minitest::Test + require "test/support/helper/env" + require "test/support/helper/fs_leak_logger" + require "test/support/helper/shutup" + require "test/support/helper/version_assertions" + include Test::Helper::Env + include Test::Helper::FSLeakLogger + include Test::Helper::Shutup + include Test::Helper::VersionAssertions + + TEST_SHA1 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze + TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze + + def formula(name = "formula_name", path = Formulary.core_path(name), spec = :stable, alias_path: nil, &block) + @_f = Class.new(Formula, &block).new(name, path, spec, alias_path: alias_path) + end + + def mktmpdir(prefix_suffix = nil, &block) + Dir.mktmpdir(prefix_suffix, HOMEBREW_TEMP, &block) + end + + def needs_compat + skip "Requires compat/ code" if ENV["HOMEBREW_NO_COMPAT"] + end + + def needs_python + skip "Requires Python" unless which("python") + end + + def assert_nothing_raised + yield + end + + def assert_eql(exp, act, msg = nil) + msg = message(msg, "") { diff exp, act } + assert exp.eql?(act), msg + end + + def refute_eql(exp, act, msg = nil) + msg = message(msg) do + "Expected #{mu_pp(act)} to not be eql to #{mu_pp(exp)}" + end + refute exp.eql?(act), msg + end + + def dylib_path(name) + Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.dylib") + end + + def bundle_path(name) + Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.bundle") + end + + # Use a stubbed {Formulary::FormulaLoader} to make a given formula be found + # when loading from {Formulary} with `ref`. + def stub_formula_loader(formula, ref = formula.full_name) + loader = mock + loader.stubs(:get_formula).returns(formula) + Formulary.stubs(:loader_for).with(ref, from: :keg).returns(loader) + Formulary.stubs(:loader_for).with(ref, from: nil).returns(loader) + end + end +end diff --git a/Library/Homebrew/test/support/helper/version_assertions.rb b/Library/Homebrew/test/support/helper/version_assertions.rb new file mode 100644 index 0000000000..dc240d6434 --- /dev/null +++ b/Library/Homebrew/test/support/helper/version_assertions.rb @@ -0,0 +1,23 @@ +require "rubygems" + +module Test + module Helper + module VersionAssertions + def version(v) + Version.create(v) + end + + def assert_version_equal(expected, actual) + assert_equal Version.create(expected), actual + end + + def assert_version_detected(expected, url, specs = {}) + assert_equal expected, Version.detect(url, specs).to_s + end + + def assert_version_nil(url) + assert Version.parse(url).null? + end + end + end +end diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index 76b943164b..be70b2fe77 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -10,7 +10,6 @@ require "formulary" %w[cache formula_cache locks cellar logs temp].each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } begin - require "rubygems" require "minitest/autorun" require "parallel_tests/test/runtime_logger" require "mocha/setup" @@ -18,108 +17,4 @@ rescue LoadError abort "Run `bundle install` or install the mocha and minitest gems before running the tests" end -module Homebrew - module VersionAssertions - def version(v) - Version.create(v) - end - - def assert_version_equal(expected, actual) - assert_equal Version.create(expected), actual - end - - def assert_version_detected(expected, url, specs = {}) - assert_equal expected, Version.detect(url, specs).to_s - end - - def assert_version_nil(url) - assert Version.parse(url).null? - end - end - - module FSLeakLogger - def self.included(klass) - require "find" - logdir = HOMEBREW_LIBRARY_PATH.join("tmp") - logdir.mkdir unless logdir.directory? - @@log = File.open(logdir.join("fs_leak.log"), "w") - klass.make_my_diffs_pretty! - end - - def before_setup - @__files_before_test = [] - Find.find(TEST_TMPDIR) { |f| @__files_before_test << f.sub(TEST_TMPDIR, "") } - super - end - - def after_teardown - super - files_after_test = [] - Find.find(TEST_TMPDIR) { |f| files_after_test << f.sub(TEST_TMPDIR, "") } - return if @__files_before_test == files_after_test - @@log.puts location, diff(@__files_before_test, files_after_test) - end - end - - class TestCase < ::Minitest::Test - require "test/support/helper/env" - require "test/support/helper/shutup" - include Test::Helper::Env - include Test::Helper::Shutup - - include VersionAssertions - include FSLeakLogger - - TEST_SHA1 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze - TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze - - def formula(name = "formula_name", path = Formulary.core_path(name), spec = :stable, alias_path: nil, &block) - @_f = Class.new(Formula, &block).new(name, path, spec, alias_path: alias_path) - end - - def mktmpdir(prefix_suffix = nil, &block) - Dir.mktmpdir(prefix_suffix, HOMEBREW_TEMP, &block) - end - - def needs_compat - skip "Requires compat/ code" if ENV["HOMEBREW_NO_COMPAT"] - end - - def needs_python - skip "Requires Python" unless which("python") - end - - def assert_nothing_raised - yield - end - - def assert_eql(exp, act, msg = nil) - msg = message(msg, "") { diff exp, act } - assert exp.eql?(act), msg - end - - def refute_eql(exp, act, msg = nil) - msg = message(msg) do - "Expected #{mu_pp(act)} to not be eql to #{mu_pp(exp)}" - end - refute exp.eql?(act), msg - end - - def dylib_path(name) - Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.dylib") - end - - def bundle_path(name) - Pathname.new("#{TEST_FIXTURE_DIR}/mach/#{name}.bundle") - end - - # Use a stubbed {Formulary::FormulaLoader} to make a given formula be found - # when loading from {Formulary} with `ref`. - def stub_formula_loader(formula, ref = formula.full_name) - loader = mock - loader.stubs(:get_formula).returns(formula) - Formulary.stubs(:loader_for).with(ref, from: :keg).returns(loader) - Formulary.stubs(:loader_for).with(ref, from: nil).returns(loader) - end - end -end +require "test/support/helper/test_case" From 9dc1f8f3cd405bc299eb688075687f951afd3e13 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 13 Nov 2016 21:35:20 +0100 Subject: [PATCH 7/8] Require `integration_command_test_case` in `testing_env`. --- .../test/support/helper/integration_command_test_case.rb | 1 + Library/Homebrew/test/test/ENV_test.rb | 1 - Library/Homebrew/test/test/analytics_test.rb | 1 - Library/Homebrew/test/test/bottle_test.rb | 1 - Library/Homebrew/test/test/bundle_test.rb | 1 - Library/Homebrew/test/test/cache_formula_test.rb | 1 - Library/Homebrew/test/test/cache_test.rb | 1 - Library/Homebrew/test/test/cask_test.rb | 1 - Library/Homebrew/test/test/cat_test.rb | 1 - Library/Homebrew/test/test/cellar_formula_test.rb | 1 - Library/Homebrew/test/test/cellar_test.rb | 1 - Library/Homebrew/test/test/cleanup_test.rb | 1 - Library/Homebrew/test/test/command_test.rb | 1 - Library/Homebrew/test/test/commands_test.rb | 1 - Library/Homebrew/test/test/config_test.rb | 1 - Library/Homebrew/test/test/create_test.rb | 1 - Library/Homebrew/test/test/custom_command_test.rb | 1 - Library/Homebrew/test/test/deps_test.rb | 1 - Library/Homebrew/test/test/desc_test.rb | 1 - Library/Homebrew/test/test/doctor_test.rb | 1 - Library/Homebrew/test/test/edit_test.rb | 1 - Library/Homebrew/test/test/fetch_test.rb | 1 - Library/Homebrew/test/test/help_test.rb | 1 - Library/Homebrew/test/test/home_test.rb | 1 - Library/Homebrew/test/test/info_test.rb | 1 - Library/Homebrew/test/test/install_test.rb | 1 - Library/Homebrew/test/test/irb_test.rb | 1 - Library/Homebrew/test/test/leaves_test.rb | 1 - Library/Homebrew/test/test/link_test.rb | 1 - Library/Homebrew/test/test/linkapps_test.rb | 1 - Library/Homebrew/test/test/list_test.rb | 1 - Library/Homebrew/test/test/log_formula_test.rb | 1 - Library/Homebrew/test/test/log_test.rb | 1 - Library/Homebrew/test/test/migrate_test.rb | 1 - Library/Homebrew/test/test/missing_test.rb | 1 - Library/Homebrew/test/test/options_test.rb | 1 - Library/Homebrew/test/test/outdated_test.rb | 1 - Library/Homebrew/test/test/pin_unpin_test.rb | 1 - Library/Homebrew/test/test/prefix_formula_test.rb | 1 - Library/Homebrew/test/test/prefix_test.rb | 1 - Library/Homebrew/test/test/prune_test.rb | 1 - Library/Homebrew/test/test/pull_offline_test.rb | 1 - Library/Homebrew/test/test/pull_test.rb | 1 - Library/Homebrew/test/test/readall_test.rb | 1 - Library/Homebrew/test/test/reinstall_pinned_test.rb | 1 - Library/Homebrew/test/test/reinstall_test.rb | 1 - Library/Homebrew/test/test/repository_test.rb | 1 - Library/Homebrew/test/test/search_test.rb | 1 - Library/Homebrew/test/test/services_test.rb | 1 - Library/Homebrew/test/test/sh_test.rb | 1 - Library/Homebrew/test/test/switch_test.rb | 1 - Library/Homebrew/test/test/tap_new_test.rb | 1 - Library/Homebrew/test/test/tap_test.rb | 1 - Library/Homebrew/test/test/test_formula_test.rb | 1 - Library/Homebrew/test/test/uninstall_test.rb | 1 - Library/Homebrew/test/test/unlink_test.rb | 1 - Library/Homebrew/test/test/unlinkapps_test.rb | 1 - Library/Homebrew/test/test/unpack_test.rb | 1 - Library/Homebrew/test/test/upgrade_test.rb | 1 - Library/Homebrew/test/test/uses_test.rb | 1 - Library/Homebrew/test/test/version_test.rb | 1 - Library/Homebrew/test/testing_env.rb | 1 + 62 files changed, 2 insertions(+), 60 deletions(-) diff --git a/Library/Homebrew/test/support/helper/integration_command_test_case.rb b/Library/Homebrew/test/support/helper/integration_command_test_case.rb index 9306617eb8..5940fd84b6 100644 --- a/Library/Homebrew/test/support/helper/integration_command_test_case.rb +++ b/Library/Homebrew/test/support/helper/integration_command_test_case.rb @@ -2,6 +2,7 @@ require "bundler" require "fileutils" require "pathname" require "formula" +require "test/support/helper/test_case" class IntegrationCommandTestCase < Homebrew::TestCase def setup diff --git a/Library/Homebrew/test/test/ENV_test.rb b/Library/Homebrew/test/test/ENV_test.rb index 1736d34af5..6c0e68a9e3 100644 --- a/Library/Homebrew/test/test/ENV_test.rb +++ b/Library/Homebrew/test/test/ENV_test.rb @@ -1,7 +1,6 @@ require "testing_env" require "extend/ENV" require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestEnv < IntegrationCommandTestCase def test_env diff --git a/Library/Homebrew/test/test/analytics_test.rb b/Library/Homebrew/test/test/analytics_test.rb index 266c5bd098..37040f3cd8 100644 --- a/Library/Homebrew/test/test/analytics_test.rb +++ b/Library/Homebrew/test/test/analytics_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestAnalytics < IntegrationCommandTestCase def test_analytics diff --git a/Library/Homebrew/test/test/bottle_test.rb b/Library/Homebrew/test/test/bottle_test.rb index 5fdba0af82..c10746e098 100644 --- a/Library/Homebrew/test/test/bottle_test.rb +++ b/Library/Homebrew/test/test/bottle_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestBottle < IntegrationCommandTestCase def test_bottle diff --git a/Library/Homebrew/test/test/bundle_test.rb b/Library/Homebrew/test/test/bundle_test.rb index ea18d5f843..ae47977d84 100644 --- a/Library/Homebrew/test/test/bundle_test.rb +++ b/Library/Homebrew/test/test/bundle_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestBundle < IntegrationCommandTestCase def test_bundle diff --git a/Library/Homebrew/test/test/cache_formula_test.rb b/Library/Homebrew/test/test/cache_formula_test.rb index c64ce9809a..6dcb6a745a 100644 --- a/Library/Homebrew/test/test/cache_formula_test.rb +++ b/Library/Homebrew/test/test/cache_formula_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCacheFormula < IntegrationCommandTestCase def test_cache_formula diff --git a/Library/Homebrew/test/test/cache_test.rb b/Library/Homebrew/test/test/cache_test.rb index f8c0356761..3a9e6b0111 100644 --- a/Library/Homebrew/test/test/cache_test.rb +++ b/Library/Homebrew/test/test/cache_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCache < IntegrationCommandTestCase def test_cache diff --git a/Library/Homebrew/test/test/cask_test.rb b/Library/Homebrew/test/test/cask_test.rb index ad7a2a0a0e..d5b81facb6 100644 --- a/Library/Homebrew/test/test/cask_test.rb +++ b/Library/Homebrew/test/test/cask_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCask < IntegrationCommandTestCase def test_cask diff --git a/Library/Homebrew/test/test/cat_test.rb b/Library/Homebrew/test/test/cat_test.rb index df64188d6c..bb37b5fdec 100644 --- a/Library/Homebrew/test/test/cat_test.rb +++ b/Library/Homebrew/test/test/cat_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCat < IntegrationCommandTestCase def test_cat diff --git a/Library/Homebrew/test/test/cellar_formula_test.rb b/Library/Homebrew/test/test/cellar_formula_test.rb index 6c3063ca3b..38a934a7ba 100644 --- a/Library/Homebrew/test/test/cellar_formula_test.rb +++ b/Library/Homebrew/test/test/cellar_formula_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCellarFormula < IntegrationCommandTestCase def test_cellar_formula diff --git a/Library/Homebrew/test/test/cellar_test.rb b/Library/Homebrew/test/test/cellar_test.rb index 32cdb1af50..74d5389f81 100644 --- a/Library/Homebrew/test/test/cellar_test.rb +++ b/Library/Homebrew/test/test/cellar_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCellar < IntegrationCommandTestCase def test_cellar diff --git a/Library/Homebrew/test/test/cleanup_test.rb b/Library/Homebrew/test/test/cleanup_test.rb index fef249fcba..bb8e1cdc61 100644 --- a/Library/Homebrew/test/test/cleanup_test.rb +++ b/Library/Homebrew/test/test/cleanup_test.rb @@ -4,7 +4,6 @@ require "cleanup" require "fileutils" require "pathname" require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCleanup < IntegrationCommandTestCase def test_cleanup diff --git a/Library/Homebrew/test/test/command_test.rb b/Library/Homebrew/test/test/command_test.rb index 620a014b91..d5c7aaa88c 100644 --- a/Library/Homebrew/test/test/command_test.rb +++ b/Library/Homebrew/test/test/command_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCommand < IntegrationCommandTestCase def test_command diff --git a/Library/Homebrew/test/test/commands_test.rb b/Library/Homebrew/test/test/commands_test.rb index cbb446ae3d..d44d2da0e7 100644 --- a/Library/Homebrew/test/test/commands_test.rb +++ b/Library/Homebrew/test/test/commands_test.rb @@ -3,7 +3,6 @@ require "cmd/command" require "cmd/commands" require "fileutils" require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCommands < IntegrationCommandTestCase def test_commands diff --git a/Library/Homebrew/test/test/config_test.rb b/Library/Homebrew/test/test/config_test.rb index 1a793cc6be..81da4660af 100644 --- a/Library/Homebrew/test/test/config_test.rb +++ b/Library/Homebrew/test/test/config_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestConfig < IntegrationCommandTestCase def test_config diff --git a/Library/Homebrew/test/test/create_test.rb b/Library/Homebrew/test/test/create_test.rb index 26a325a22f..aeee428aa9 100644 --- a/Library/Homebrew/test/test/create_test.rb +++ b/Library/Homebrew/test/test/create_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCreate < IntegrationCommandTestCase def test_create diff --git a/Library/Homebrew/test/test/custom_command_test.rb b/Library/Homebrew/test/test/custom_command_test.rb index 71bfafd9b5..8d05bc6c7f 100644 --- a/Library/Homebrew/test/test/custom_command_test.rb +++ b/Library/Homebrew/test/test/custom_command_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestCustomCommand < IntegrationCommandTestCase def test_custom_command diff --git a/Library/Homebrew/test/test/deps_test.rb b/Library/Homebrew/test/test/deps_test.rb index 44803af5e5..01639857c9 100644 --- a/Library/Homebrew/test/test/deps_test.rb +++ b/Library/Homebrew/test/test/deps_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDeps < IntegrationCommandTestCase def test_deps diff --git a/Library/Homebrew/test/test/desc_test.rb b/Library/Homebrew/test/test/desc_test.rb index 7428c07924..2ba498135e 100644 --- a/Library/Homebrew/test/test/desc_test.rb +++ b/Library/Homebrew/test/test/desc_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDesc < IntegrationCommandTestCase def test_desc diff --git a/Library/Homebrew/test/test/doctor_test.rb b/Library/Homebrew/test/test/doctor_test.rb index be1098d22b..d2dc871f40 100644 --- a/Library/Homebrew/test/test/doctor_test.rb +++ b/Library/Homebrew/test/test/doctor_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestDoctor < IntegrationCommandTestCase def test_doctor diff --git a/Library/Homebrew/test/test/edit_test.rb b/Library/Homebrew/test/test/edit_test.rb index c78db3bd80..9b6ded6519 100644 --- a/Library/Homebrew/test/test/edit_test.rb +++ b/Library/Homebrew/test/test/edit_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestEdit < IntegrationCommandTestCase def test_edit diff --git a/Library/Homebrew/test/test/fetch_test.rb b/Library/Homebrew/test/test/fetch_test.rb index e049db5541..e08e545e3b 100644 --- a/Library/Homebrew/test/test/fetch_test.rb +++ b/Library/Homebrew/test/test/fetch_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestFetch < IntegrationCommandTestCase def test_fetch diff --git a/Library/Homebrew/test/test/help_test.rb b/Library/Homebrew/test/test/help_test.rb index 8c9a4bb081..92dd997217 100644 --- a/Library/Homebrew/test/test/help_test.rb +++ b/Library/Homebrew/test/test/help_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestHelp < IntegrationCommandTestCase def test_help diff --git a/Library/Homebrew/test/test/home_test.rb b/Library/Homebrew/test/test/home_test.rb index 9116442b7b..ff06b72c1d 100644 --- a/Library/Homebrew/test/test/home_test.rb +++ b/Library/Homebrew/test/test/home_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestHome < IntegrationCommandTestCase def test_home diff --git a/Library/Homebrew/test/test/info_test.rb b/Library/Homebrew/test/test/info_test.rb index a4186a5e9a..f71044bf02 100644 --- a/Library/Homebrew/test/test/info_test.rb +++ b/Library/Homebrew/test/test/info_test.rb @@ -2,7 +2,6 @@ require "testing_env" require "cmd/info" require "formula" require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestInfo < IntegrationCommandTestCase def test_info diff --git a/Library/Homebrew/test/test/install_test.rb b/Library/Homebrew/test/test/install_test.rb index 3131259311..fa1057a027 100644 --- a/Library/Homebrew/test/test/install_test.rb +++ b/Library/Homebrew/test/test/install_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestInstall < IntegrationCommandTestCase def test_install diff --git a/Library/Homebrew/test/test/irb_test.rb b/Library/Homebrew/test/test/irb_test.rb index 77ca4a90db..832ca39a50 100644 --- a/Library/Homebrew/test/test/irb_test.rb +++ b/Library/Homebrew/test/test/irb_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestIrb < IntegrationCommandTestCase def test_irb diff --git a/Library/Homebrew/test/test/leaves_test.rb b/Library/Homebrew/test/test/leaves_test.rb index ef25a4b6eb..f73fba1ea3 100644 --- a/Library/Homebrew/test/test/leaves_test.rb +++ b/Library/Homebrew/test/test/leaves_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLeaves < IntegrationCommandTestCase def test_leaves diff --git a/Library/Homebrew/test/test/link_test.rb b/Library/Homebrew/test/test/link_test.rb index ecabe0c675..062caa0c07 100644 --- a/Library/Homebrew/test/test/link_test.rb +++ b/Library/Homebrew/test/test/link_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLink < IntegrationCommandTestCase def test_link diff --git a/Library/Homebrew/test/test/linkapps_test.rb b/Library/Homebrew/test/test/linkapps_test.rb index a0b33a543d..4c5b8ec134 100644 --- a/Library/Homebrew/test/test/linkapps_test.rb +++ b/Library/Homebrew/test/test/linkapps_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLinkapps < IntegrationCommandTestCase def test_linkapps diff --git a/Library/Homebrew/test/test/list_test.rb b/Library/Homebrew/test/test/list_test.rb index 26aab741f4..3c691e3adc 100644 --- a/Library/Homebrew/test/test/list_test.rb +++ b/Library/Homebrew/test/test/list_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestList < IntegrationCommandTestCase def test_list diff --git a/Library/Homebrew/test/test/log_formula_test.rb b/Library/Homebrew/test/test/log_formula_test.rb index 26c10d3812..bb6a1f6619 100644 --- a/Library/Homebrew/test/test/log_formula_test.rb +++ b/Library/Homebrew/test/test/log_formula_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLogFormula < IntegrationCommandTestCase def test_log_formula diff --git a/Library/Homebrew/test/test/log_test.rb b/Library/Homebrew/test/test/log_test.rb index c9eb73d978..b2e150ccd5 100644 --- a/Library/Homebrew/test/test/log_test.rb +++ b/Library/Homebrew/test/test/log_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestLog < IntegrationCommandTestCase def test_log diff --git a/Library/Homebrew/test/test/migrate_test.rb b/Library/Homebrew/test/test/migrate_test.rb index c267629a31..17929d0383 100644 --- a/Library/Homebrew/test/test/migrate_test.rb +++ b/Library/Homebrew/test/test/migrate_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestMigrate < IntegrationCommandTestCase def test_migrate diff --git a/Library/Homebrew/test/test/missing_test.rb b/Library/Homebrew/test/test/missing_test.rb index 9ad0ab0b8c..4f20d8a7af 100644 --- a/Library/Homebrew/test/test/missing_test.rb +++ b/Library/Homebrew/test/test/missing_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestMissing < IntegrationCommandTestCase def setup diff --git a/Library/Homebrew/test/test/options_test.rb b/Library/Homebrew/test/test/options_test.rb index 43ea26b97e..e7189a6042 100644 --- a/Library/Homebrew/test/test/options_test.rb +++ b/Library/Homebrew/test/test/options_test.rb @@ -1,7 +1,6 @@ require "testing_env" require "options" require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestOptions < IntegrationCommandTestCase def test_options diff --git a/Library/Homebrew/test/test/outdated_test.rb b/Library/Homebrew/test/test/outdated_test.rb index 03c2293d8c..3e7148ded4 100644 --- a/Library/Homebrew/test/test/outdated_test.rb +++ b/Library/Homebrew/test/test/outdated_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestOutdated < IntegrationCommandTestCase def test_outdated diff --git a/Library/Homebrew/test/test/pin_unpin_test.rb b/Library/Homebrew/test/test/pin_unpin_test.rb index 9603620a30..65fb9e4daa 100644 --- a/Library/Homebrew/test/test/pin_unpin_test.rb +++ b/Library/Homebrew/test/test/pin_unpin_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPinUnpin < IntegrationCommandTestCase def test_pin_unpin diff --git a/Library/Homebrew/test/test/prefix_formula_test.rb b/Library/Homebrew/test/test/prefix_formula_test.rb index e51de2b6f0..eb5970d3e2 100644 --- a/Library/Homebrew/test/test/prefix_formula_test.rb +++ b/Library/Homebrew/test/test/prefix_formula_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrefixFormula < IntegrationCommandTestCase def test_prefix_formula diff --git a/Library/Homebrew/test/test/prefix_test.rb b/Library/Homebrew/test/test/prefix_test.rb index 1b21148078..a3ae755426 100644 --- a/Library/Homebrew/test/test/prefix_test.rb +++ b/Library/Homebrew/test/test/prefix_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrefix < IntegrationCommandTestCase def test_prefix diff --git a/Library/Homebrew/test/test/prune_test.rb b/Library/Homebrew/test/test/prune_test.rb index b810621123..8fa5df7b7f 100644 --- a/Library/Homebrew/test/test/prune_test.rb +++ b/Library/Homebrew/test/test/prune_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPrune < IntegrationCommandTestCase def test_prune diff --git a/Library/Homebrew/test/test/pull_offline_test.rb b/Library/Homebrew/test/test/pull_offline_test.rb index 1429ca62e3..c9d46cd74b 100644 --- a/Library/Homebrew/test/test/pull_offline_test.rb +++ b/Library/Homebrew/test/test/pull_offline_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPullOffline < IntegrationCommandTestCase def test_pull_offline diff --git a/Library/Homebrew/test/test/pull_test.rb b/Library/Homebrew/test/test/pull_test.rb index f772454bab..445d73cb18 100644 --- a/Library/Homebrew/test/test/pull_test.rb +++ b/Library/Homebrew/test/test/pull_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestPull < IntegrationCommandTestCase def test_pull diff --git a/Library/Homebrew/test/test/readall_test.rb b/Library/Homebrew/test/test/readall_test.rb index cbb304ca1b..3eec79dd8b 100644 --- a/Library/Homebrew/test/test/readall_test.rb +++ b/Library/Homebrew/test/test/readall_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReadall < IntegrationCommandTestCase def test_readall diff --git a/Library/Homebrew/test/test/reinstall_pinned_test.rb b/Library/Homebrew/test/test/reinstall_pinned_test.rb index 36f5cfd74b..80f5518ea9 100644 --- a/Library/Homebrew/test/test/reinstall_pinned_test.rb +++ b/Library/Homebrew/test/test/reinstall_pinned_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReinstallPinned < IntegrationCommandTestCase def test_reinstall_pinned diff --git a/Library/Homebrew/test/test/reinstall_test.rb b/Library/Homebrew/test/test/reinstall_test.rb index 5018301027..73877b35d5 100644 --- a/Library/Homebrew/test/test/reinstall_test.rb +++ b/Library/Homebrew/test/test/reinstall_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestReinstall < IntegrationCommandTestCase def test_reinstall diff --git a/Library/Homebrew/test/test/repository_test.rb b/Library/Homebrew/test/test/repository_test.rb index 352ab1d42b..77967a58da 100644 --- a/Library/Homebrew/test/test/repository_test.rb +++ b/Library/Homebrew/test/test/repository_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestRepository < IntegrationCommandTestCase def test_repository diff --git a/Library/Homebrew/test/test/search_test.rb b/Library/Homebrew/test/test/search_test.rb index 95e555bf24..70b6f01fb1 100644 --- a/Library/Homebrew/test/test/search_test.rb +++ b/Library/Homebrew/test/test/search_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSearch < IntegrationCommandTestCase def test_search diff --git a/Library/Homebrew/test/test/services_test.rb b/Library/Homebrew/test/test/services_test.rb index 94fba4675f..280aeb9f42 100644 --- a/Library/Homebrew/test/test/services_test.rb +++ b/Library/Homebrew/test/test/services_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestServices < IntegrationCommandTestCase def test_services diff --git a/Library/Homebrew/test/test/sh_test.rb b/Library/Homebrew/test/test/sh_test.rb index 67593b17e4..48fcdc54ab 100644 --- a/Library/Homebrew/test/test/sh_test.rb +++ b/Library/Homebrew/test/test/sh_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSh < IntegrationCommandTestCase def test_sh diff --git a/Library/Homebrew/test/test/switch_test.rb b/Library/Homebrew/test/test/switch_test.rb index 766d244940..af1926c39e 100644 --- a/Library/Homebrew/test/test/switch_test.rb +++ b/Library/Homebrew/test/test/switch_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestSwitch < IntegrationCommandTestCase def test_switch diff --git a/Library/Homebrew/test/test/tap_new_test.rb b/Library/Homebrew/test/test/tap_new_test.rb index 57ad4a08e2..261a334f0f 100644 --- a/Library/Homebrew/test/test/tap_new_test.rb +++ b/Library/Homebrew/test/test/tap_new_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTapNew < IntegrationCommandTestCase def test_tap_readme diff --git a/Library/Homebrew/test/test/tap_test.rb b/Library/Homebrew/test/test/tap_test.rb index 94597cdb3f..b950cd1666 100644 --- a/Library/Homebrew/test/test/tap_test.rb +++ b/Library/Homebrew/test/test/tap_test.rb @@ -1,6 +1,5 @@ require "testing_env" require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTap < IntegrationCommandTestCase def test_tap diff --git a/Library/Homebrew/test/test/test_formula_test.rb b/Library/Homebrew/test/test/test_formula_test.rb index cab4db7409..5ad2db9e98 100644 --- a/Library/Homebrew/test/test/test_formula_test.rb +++ b/Library/Homebrew/test/test/test_formula_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestTestFormula < IntegrationCommandTestCase def test_test_formula diff --git a/Library/Homebrew/test/test/uninstall_test.rb b/Library/Homebrew/test/test/uninstall_test.rb index ffc6f0db7a..70a6943531 100644 --- a/Library/Homebrew/test/test/uninstall_test.rb +++ b/Library/Homebrew/test/test/uninstall_test.rb @@ -1,4 +1,3 @@ -require "test/support/helper/integration_command_test_case" require "cmd/uninstall" class UninstallTests < Homebrew::TestCase diff --git a/Library/Homebrew/test/test/unlink_test.rb b/Library/Homebrew/test/test/unlink_test.rb index a307dc638b..6d5cefc678 100644 --- a/Library/Homebrew/test/test/unlink_test.rb +++ b/Library/Homebrew/test/test/unlink_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnlink < IntegrationCommandTestCase def test_unlink diff --git a/Library/Homebrew/test/test/unlinkapps_test.rb b/Library/Homebrew/test/test/unlinkapps_test.rb index 2dbbd84e91..9d9672199c 100644 --- a/Library/Homebrew/test/test/unlinkapps_test.rb +++ b/Library/Homebrew/test/test/unlinkapps_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnlinkapps < IntegrationCommandTestCase def test_unlinkapps diff --git a/Library/Homebrew/test/test/unpack_test.rb b/Library/Homebrew/test/test/unpack_test.rb index e044e713ba..bbff6ad1c4 100644 --- a/Library/Homebrew/test/test/unpack_test.rb +++ b/Library/Homebrew/test/test/unpack_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUnpack < IntegrationCommandTestCase def test_unpack diff --git a/Library/Homebrew/test/test/upgrade_test.rb b/Library/Homebrew/test/test/upgrade_test.rb index 7c74ca70e2..f3f5dccc7a 100644 --- a/Library/Homebrew/test/test/upgrade_test.rb +++ b/Library/Homebrew/test/test/upgrade_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUpgrade < IntegrationCommandTestCase def test_upgrade diff --git a/Library/Homebrew/test/test/uses_test.rb b/Library/Homebrew/test/test/uses_test.rb index 494ce4d6e8..2b15554179 100644 --- a/Library/Homebrew/test/test/uses_test.rb +++ b/Library/Homebrew/test/test/uses_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestUses < IntegrationCommandTestCase def test_uses diff --git a/Library/Homebrew/test/test/version_test.rb b/Library/Homebrew/test/test/version_test.rb index a783eda690..e7ffbc4f63 100644 --- a/Library/Homebrew/test/test/version_test.rb +++ b/Library/Homebrew/test/test/version_test.rb @@ -1,5 +1,4 @@ require "testing_env" -require "test/support/helper/integration_command_test_case" class IntegrationCommandTestVersion < IntegrationCommandTestCase def test_version diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index be70b2fe77..e2ba2e4e42 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -18,3 +18,4 @@ rescue LoadError end require "test/support/helper/test_case" +require "test/support/helper/integration_command_test_case" From 7457af2b231528e1287281f6cfe651600d5f3f5d Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 13 Nov 2016 22:00:15 +0100 Subject: [PATCH 8/8] 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