Merge pull request #6707 from MikeMcQuaid/portable-ruby-test-fixes

test: re-enable portable Ruby tests.
This commit is contained in:
Mike McQuaid 2019-11-06 20:32:42 +00:00 committed by GitHub
commit f7e7e32f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 10 deletions

View File

@ -6,7 +6,7 @@ describe "Homebrew.install_args" do
it_behaves_like "parseable arguments" it_behaves_like "parseable arguments"
end end
describe "brew install", :integration_test, :needs_no_bad_linux_portable_ruby do describe "brew install", :integration_test do
it "installs formulae" do it "installs formulae" do
setup_test_formula "testball1" setup_test_formula "testball1"

View File

@ -6,7 +6,7 @@ describe "Homebrew.migrate_args" do
it_behaves_like "parseable arguments" it_behaves_like "parseable arguments"
end end
describe "brew migrate", :integration_test, :needs_no_bad_linux_portable_ruby do describe "brew migrate", :integration_test do
it "migrates a renamed Formula" do it "migrates a renamed Formula" do
setup_test_formula "testball1" setup_test_formula "testball1"
setup_test_formula "testball2" setup_test_formula "testball2"

View File

@ -7,7 +7,7 @@ describe "Homebrew.reinstall_args" do
it_behaves_like "parseable arguments" it_behaves_like "parseable arguments"
end end
describe "brew reinstall", :integration_test, :needs_no_bad_linux_portable_ruby do describe "brew reinstall", :integration_test do
it "reinstalls a Formula" do it "reinstalls a Formula" do
install_test_formula "testball" install_test_formula "testball"
foo_dir = HOMEBREW_CELLAR/"testball/0.1/bin" foo_dir = HOMEBREW_CELLAR/"testball/0.1/bin"

View File

@ -6,7 +6,7 @@ describe "Homebrew.upgrade_args" do
it_behaves_like "parseable arguments" it_behaves_like "parseable arguments"
end end
describe "brew upgrade", :integration_test, :needs_no_bad_linux_portable_ruby do describe "brew upgrade", :integration_test do
it "upgrades a Formula and cleans up old versions" do it "upgrades a Formula and cleans up old versions" do
setup_test_formula "testball" setup_test_formula "testball"
(HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath (HOMEBREW_CELLAR/"testball/0.0.1/foo").mkpath

View File

@ -6,7 +6,7 @@ describe "Homebrew.ruby_args" do
it_behaves_like "parseable arguments" it_behaves_like "parseable arguments"
end end
describe "brew ruby", :integration_test, :needs_no_bad_linux_portable_ruby do describe "brew ruby", :integration_test do
it "executes ruby code with Homebrew's libraries loaded" do it "executes ruby code with Homebrew's libraries loaded" do
expect { brew "ruby", "-e", "exit 0" } expect { brew "ruby", "-e", "exit 0" }
.to be_a_success .to be_a_success

View File

@ -6,7 +6,7 @@ describe "Homebrew.test_args" do
it_behaves_like "parseable arguments" it_behaves_like "parseable arguments"
end end
describe "brew test", :integration_test, :needs_no_bad_linux_portable_ruby do describe "brew test", :integration_test do
it "tests a given Formula" do it "tests a given Formula" do
install_test_formula "testball", <<~'RUBY' install_test_formula "testball", <<~'RUBY'
test do test do

View File

@ -143,10 +143,6 @@ RSpec.configure do |config|
skip "unzip not installed." unless which("unzip") skip "unzip not installed." unless which("unzip")
end 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| config.around do |example|
def find_files def find_files
Find.find(TEST_TMPDIR) Find.find(TEST_TMPDIR)