From 52a6c7e0bd1f5034ee237fedd58fb4afd5927e88 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Fri, 17 Jan 2025 10:03:17 +0000 Subject: [PATCH 1/2] [Test Runner] Skips lookup index tests --- elasticsearch-api/spec/rest_api/skipped_tests_free.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/elasticsearch-api/spec/rest_api/skipped_tests_free.yml b/elasticsearch-api/spec/rest_api/skipped_tests_free.yml index d1f9a4f102..5369a80e3f 100644 --- a/elasticsearch-api/spec/rest_api/skipped_tests_free.yml +++ b/elasticsearch-api/spec/rest_api/skipped_tests_free.yml @@ -234,3 +234,9 @@ - :file: 'indices.recovery/20_synthetic_source.yml' :description: 'test recovery empty index with use_synthetic_source' +- + :file: 'indices.create/10_basic.yml' + :description: 'Create lookup index' +- + :file: 'indices.create/10_basic.yml' + :description: 'Create lookup index with one shard' From e5db4142e0a70b3483510294e3894f926bb620f8 Mon Sep 17 00:00:00 2001 From: Fernando Briano Date: Thu, 16 Jan 2025 14:20:30 +0000 Subject: [PATCH 2/2] [Gem] Lock concurrent-ruby for JRuby 9.3 --- elasticsearch-api/elasticsearch-api.gemspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elasticsearch-api/elasticsearch-api.gemspec b/elasticsearch-api/elasticsearch-api.gemspec index a458ed60d1..ebc59fcf0d 100644 --- a/elasticsearch-api/elasticsearch-api.gemspec +++ b/elasticsearch-api/elasticsearch-api.gemspec @@ -49,7 +49,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'ansi' s.add_development_dependency 'bundler' s.add_development_dependency 'elasticsearch' - s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= "9.4" + s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= '9.4' s.add_development_dependency 'minitest' s.add_development_dependency 'minitest-reporters', '>= 1.6' s.add_development_dependency 'mocha' @@ -59,6 +59,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'yard' # Gems for testing integrations + s.add_development_dependency 'concurrent-ruby', '1.3.4' if defined? JRUBY_VERSION && JRUBY_VERSION < '9.4' s.add_development_dependency 'jsonify' s.add_development_dependency 'hashie' # Temporary support for Ruby 2.6, since it's EOL March 2022: