From 2d51b8189b0da2a592a31d354ad7302cd2adc72a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 10 Oct 2019 15:48:15 +0100 Subject: [PATCH] test: disable some tests on Linux portable ruby. --- Library/Homebrew/test/cmd/install_spec.rb | 2 +- Library/Homebrew/test/cmd/migrate_spec.rb | 2 +- Library/Homebrew/test/cmd/reinstall_spec.rb | 2 +- Library/Homebrew/test/cmd/upgrade_spec.rb | 2 +- Library/Homebrew/test/dev-cmd/ruby_spec.rb | 2 +- Library/Homebrew/test/dev-cmd/test_spec.rb | 2 +- Library/Homebrew/test/spec_helper.rb | 4 ++++ 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/test/cmd/install_spec.rb b/Library/Homebrew/test/cmd/install_spec.rb index 0bc91c86c5..5714ddc41d 100644 --- a/Library/Homebrew/test/cmd/install_spec.rb +++ b/Library/Homebrew/test/cmd/install_spec.rb @@ -6,7 +6,7 @@ describe "Homebrew.install_args" do it_behaves_like "parseable arguments" end -describe "brew install", :integration_test do +describe "brew install", :integration_test, :needs_no_bad_linux_portable_ruby do it "installs formulae" do setup_test_formula "testball1" diff --git a/Library/Homebrew/test/cmd/migrate_spec.rb b/Library/Homebrew/test/cmd/migrate_spec.rb index 8c8faee079..0b46b2ca2c 100644 --- a/Library/Homebrew/test/cmd/migrate_spec.rb +++ b/Library/Homebrew/test/cmd/migrate_spec.rb @@ -6,7 +6,7 @@ describe "Homebrew.migrate_args" do it_behaves_like "parseable arguments" end -describe "brew migrate", :integration_test do +describe "brew migrate", :integration_test, :needs_no_bad_linux_portable_ruby do it "migrates a renamed Formula" do setup_test_formula "testball1" setup_test_formula "testball2" diff --git a/Library/Homebrew/test/cmd/reinstall_spec.rb b/Library/Homebrew/test/cmd/reinstall_spec.rb index 45b5a48ffb..f4ef3c8eda 100644 --- a/Library/Homebrew/test/cmd/reinstall_spec.rb +++ b/Library/Homebrew/test/cmd/reinstall_spec.rb @@ -7,7 +7,7 @@ describe "Homebrew.reinstall_args" do it_behaves_like "parseable arguments" end -describe "brew reinstall", :integration_test do +describe "brew reinstall", :integration_test, :needs_no_bad_linux_portable_ruby do it "reinstalls a Formula" do install_test_formula "testball" foo_dir = HOMEBREW_CELLAR/"testball/0.1/bin" diff --git a/Library/Homebrew/test/cmd/upgrade_spec.rb b/Library/Homebrew/test/cmd/upgrade_spec.rb index 9f139fc059..f5ffc1113e 100644 --- a/Library/Homebrew/test/cmd/upgrade_spec.rb +++ b/Library/Homebrew/test/cmd/upgrade_spec.rb @@ -6,7 +6,7 @@ describe "Homebrew.upgrade_args" do it_behaves_like "parseable arguments" end -describe "brew upgrade", :integration_test do +describe "brew upgrade", :integration_test, :needs_no_bad_linux_portable_ruby do it "upgrades a Formula and cleans up old versions" do setup_test_formula "testball" (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath diff --git a/Library/Homebrew/test/dev-cmd/ruby_spec.rb b/Library/Homebrew/test/dev-cmd/ruby_spec.rb index 42bb98c1fd..224c9e499b 100644 --- a/Library/Homebrew/test/dev-cmd/ruby_spec.rb +++ b/Library/Homebrew/test/dev-cmd/ruby_spec.rb @@ -6,7 +6,7 @@ describe "Homebrew.ruby_args" do it_behaves_like "parseable arguments" end -describe "brew ruby", :integration_test do +describe "brew ruby", :integration_test, :needs_no_bad_linux_portable_ruby do it "executes ruby code with Homebrew's libraries loaded" do expect { brew "ruby", "-e", "exit 0" } .to be_a_success diff --git a/Library/Homebrew/test/dev-cmd/test_spec.rb b/Library/Homebrew/test/dev-cmd/test_spec.rb index 26f45c4218..10d538ef76 100644 --- a/Library/Homebrew/test/dev-cmd/test_spec.rb +++ b/Library/Homebrew/test/dev-cmd/test_spec.rb @@ -6,7 +6,7 @@ describe "Homebrew.test_args" do it_behaves_like "parseable arguments" end -describe "brew test", :integration_test do +describe "brew test", :integration_test, :needs_no_bad_linux_portable_ruby do it "tests a given Formula" do install_test_formula "testball", <<~'RUBY' test do diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 1ded62cb16..de2576c676 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -132,6 +132,10 @@ RSpec.configure do |config| skip "unzip not installed." unless which("unzip") end + config.before(:each, :needs_no_bad_linux_portable_ruby) do + skip "using Linux portable-ruby." if OS.linux? && RUBY_PATH.to_s.end_with?("portable-ruby/2.6.3/bin/ruby") + end + config.around do |example| def find_files Find.find(TEST_TMPDIR)