Merge pull request #812 from newrelic/fix_jruby_typheous_failure

Fix test failures for typhoeus on jruby
newrelic · Oct 19, 2021 · 231b757 · 231b757
2 parents bc455ac + 558c819
commit 231b757
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 1 deletion.
diff --git a/test/environments/rails42/Gemfile b/test/environments/rails42/Gemfile
@@ -13,6 +13,7 @@ platforms :jruby do
   gem "activerecord-jdbcmysql-adapter", "~>1.3.0"
   gem "activerecord-jdbcsqlite3-adapter", "~>1.3.0"
   gem "jruby-openssl"
+  gem 'racc', '<= 1.5.2'
 end
 
 platforms :ruby, :rbx do

diff --git a/test/environments/rails51/Gemfile b/test/environments/rails51/Gemfile
@@ -13,6 +13,7 @@ platforms :jruby do
   gem "activerecord-jdbcmysql-adapter", "~> 51.0"
   gem "activerecord-jdbcsqlite3-adapter", "~> 51.0"
   gem "jruby-openssl"
+  gem 'racc', '<= 1.5.2'
 end
 
 platforms :ruby, :rbx do

diff --git a/test/multiverse/suites/activemerchant/Envfile b/test/multiverse/suites/activemerchant/Envfile
@@ -9,6 +9,8 @@ if RUBY_VERSION >= '3.0.0'
     gem 'nokogiri'
     gem 'minitest', '~> 5.1.0'
 
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
+
     # Need to load newrelic_rpm after ActiveMerchant Gateways are required
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB
@@ -23,6 +25,8 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0'
     gem 'nokogiri'
     gem 'minitest', '~> 5.1.0'
 
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
+
     # Need to load newrelic_rpm after ActiveMerchant Gateways are required
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB
@@ -37,6 +41,8 @@ if RUBY_VERSION >= '2.3.0' && RUBY_VERSION < '3.0.0'
     gem 'nokogiri'
     gem 'minitest', '~> 5.1.0'
 
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
+
     # Need to load newrelic_rpm after ActiveMerchant Gateways are required
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB
@@ -52,6 +58,8 @@ if RUBY_VERSION < '2.4.0'
     gem 'activesupport', '~>4.0.4'
     gem 'nokogiri', '~>1.6.1'
 
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
+
     # Need to load newrelic_rpm after ActiveMerchant Gateways are required
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB

diff --git a/test/multiverse/suites/rails/Envfile b/test/multiverse/suites/rails/Envfile
@@ -1,6 +1,7 @@
 if RUBY_VERSION >= '2.5.0'
   gemfile <<-RB
     gem 'rails', '~> 6.1.0'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '2.0.0'
     gem 'minitest', '5.2.3'
@@ -12,6 +13,7 @@ if RUBY_VERSION >= '2.5.0' && RUBY_VERSION < '3.0.0'
 
   gemfile <<-RB
     gem 'rails', '6.0.0'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '2.0.0'
     gem 'minitest', '5.2.3'
@@ -23,20 +25,23 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0'
 
   gemfile <<-RB
     gem 'rails', '5.2.2'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '~>1.0.0'
     gem 'minitest', '5.2.3'
   RB
 
   gemfile <<-RB
     gem 'rails', '~>5.1.0'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '~>1.0.0'
     gem 'minitest', '5.2.3'
   RB
 
   gemfile <<-RB
     gem 'rails', '~>5.0.0'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '~>1.0.0'
     gem 'minitest', '5.2.3'
@@ -46,6 +51,7 @@ end
 if RUBY_VERSION < '2.4.0'
   gemfile <<-RB
     gem 'rails', '~>4.2.1'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '~>1.0.0'
     gem 'minitest', '5.2.3'
@@ -54,6 +60,7 @@ if RUBY_VERSION < '2.4.0'
 
   gemfile <<-RB
     gem 'rails', '~>4.1.10'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for
     # now
     gem 'haml', '~>5.0.0'
@@ -64,20 +71,23 @@ if RUBY_VERSION < '2.4.0'
 
   gemfile <<-RB
     gem 'rails', '~>4.0.13'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'haml', '~>5.0.0'
     gem 'haml-rails', '~>1.0.0'
     gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
   RB
 
   gemfile <<-RB
     gem 'rails', '~>3.2.22.2'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'i18n', '~>0.6.11'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
     gem 'minitest_tu_shim', :require => false
   RB
 
   gemfile <<-RB
     gem 'rails', '~>3.2.22.2'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'i18n', '~>0.6.11'
     gem 'sinatra', '~> 1.4.5'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3

diff --git a/test/multiverse/suites/rails_prepend/Envfile b/test/multiverse/suites/rails_prepend/Envfile
@@ -4,6 +4,7 @@ if RUBY_VERSION >= '2.5.0'  && RUBY_VERSION < '3.0.0'
     gem 'haml', '~>5.0.0'
     gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
     gem 'minitest', '5.2.3'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
   RB
 end
 
@@ -13,19 +14,22 @@ if RUBY_VERSION >= '2.2.2' && RUBY_VERSION < '3.0.0'
     gem 'haml', '~>5.0.0'
     gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
     gem 'minitest', '5.2.3'
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
   RB
 
   gemfile <<-RB
     gem 'rails', '~>5.1.0'
     gem 'haml', '~>5.0.0'
     gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'minitest', '5.2.3'
   RB
 
   gemfile <<-RB
     gem 'rails', '~>5.0.0'
     gem 'haml', '~>5.0.0'
     gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
     gem 'minitest', '5.2.3'
   RB
 end
@@ -38,7 +42,8 @@ if RUBY_VERSION < '2.4.0'
     gem 'minitest', '5.2.3'
     gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
     gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors
-  RB
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
+    RB
 
   gemfile <<-RB
     gem 'rails', '~>4.1.10'
@@ -49,6 +54,7 @@ if RUBY_VERSION < '2.4.0'
     gem 'minitest', '5.2.3'
     gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
     gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
   RB
 
   gemfile <<-RB
@@ -57,5 +63,6 @@ if RUBY_VERSION < '2.4.0'
     gem 'newrelic_prepender', path: File.expand_path('../newrelic_prepender', __FILE__)
     gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
     gem 'thor', '< 0.20.1' if RUBY_PLATFORM == 'java' # unpredictable thor errors
+    gem 'racc', '<= 1.5.2' if RUBY_PLATFORM == 'java'
   RB
 end
diff --git a/test/multiverse/suites/typhoeus/Envfile b/test/multiverse/suites/typhoeus/Envfile
@@ -7,13 +7,19 @@ instrumentation_methods :chain, :prepend
 
 gemfile <<-RB
   gem 'typhoeus' # latest version
+  if RUBY_PLATFORM == 'java'
+    gem 'ethon', '0.14.0' 
+  end
   gem 'rack'
   #{ruby3_gem_webrick}
 RB
 
 SUPPORTED_TYPHOEUS_VERSIONS.each do |version|
   gemfile <<-RB
     gem 'typhoeus', '~> #{version}'
+    if RUBY_PLATFORM == 'java'
+      gem 'ethon', '0.14.0' 
+    end
     gem 'rack'
     #{ruby3_gem_webrick}
   RB