diff --git a/lib/searchkick.rb b/lib/searchkick.rb index a697809..551463d 100644 --- a/lib/searchkick.rb +++ b/lib/searchkick.rb @@ -80,7 +80,7 @@ module Searchkick end def self.server_version - @server_version ||= opensearch? ? "7.10.2" : server_info["version"]["number"] + @server_version ||= server_info["version"]["number"] end def self.opensearch? @@ -91,7 +91,11 @@ module Searchkick end def self.server_below?(version) - Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0]) + if opensearch? + Gem::Version.new("7.10.2") < Gem::Version.new(version.split("-")[0]) + else + Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0]) + end end # memoize for performance diff --git a/test/search_synonyms_test.rb b/test/search_synonyms_test.rb index fca4ea1..ec4e72f 100644 --- a/test/search_synonyms_test.rb +++ b/test/search_synonyms_test.rb @@ -60,6 +60,8 @@ class SearchSynonymsTest < Minitest::Test end def test_reload_synonyms + skip if Searchkick.opensearch? + if Searchkick.server_below?("7.3.0") error = assert_raises(Searchkick::Error) do Speaker.search_index.reload_synonyms diff --git a/test/test_helper.rb b/test/test_helper.rb index 5fc96b4..479ac9c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -19,7 +19,7 @@ Searchkick.index_suffix = ENV["TEST_ENV_NUMBER"] # for parallel tests # add to elasticsearch-7.0.0/config/ Searchkick.wordnet_path = "wn_s.pl" if ENV["WORDNET"] -puts "Running against Elasticsearch #{Searchkick.server_version}" +puts "Running against #{Searchkick.opensearch? ? "OpenSearch" : "Elasticsearch"} #{Searchkick.server_version}" Searchkick.redis = if defined?(ConnectionPool) -- libgit2 0.21.0