Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update typhoeus multiverse suite_condition #1838

Merged
merged 1 commit into from
Feb 24, 2023
Merged

Update typhoeus multiverse suite_condition #1838

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/multiverse/suites/typhoeus/Envfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

# TODO: JRuby 9.3.7.0 crashes with Ubuntu 22 and JREs 8 and 11
suite_condition("Typhoeus is skipped for JRuby with Ubuntu 22") do
RUBY_PLATFORM != 'java' &&
RUBY_PLATFORM != 'java' || (RUBY_PLATFORM == 'java' &&
File.exist?('/etc/lsb-release') &&
File.read('/etc/lsb-release') =~ /DISTRIB_RELEASE=22\.04/
File.read('/etc/lsb-release') =~ /DISTRIB_RELEASE=22\.04/)
end

instrumentation_methods :chain, :prepend
Expand All @@ -23,7 +23,7 @@ def gem_list(typhoeus_version = nil)
gem 'typhoeus'#{typhoeus_version}
gem 'ethon' if RUBY_PLATFORM == 'java'
gem 'rack'

RB
end

Expand Down