Skip to content

Fix the unit test failures caused by #223 #226

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

Merged
merged 2 commits into from
Mar 17, 2025
Merged

Fix the unit test failures caused by #223 #226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5471b74
Fix the unit test failures casued by #223
mashhurs Mar 17, 2025
ac9660b
Check es-ruby client v8 availibility with a separate method in the spec.
mashhurs Mar 17, 2025
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
24 changes: 19 additions & 5 deletions spec/inputs/elasticsearch_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
let(:es_version) { "7.5.0" }
let(:cluster_info) { {"version" => {"number" => es_version, "build_flavor" => build_flavor}, "tagline" => "You Know, for Search"} }

def elastic_ruby_v8_client_available?
Elasticsearch::Transport
false
rescue NameError # NameError: uninitialized constant Elasticsearch::Transport if Elastic Ruby client is not available
true
end

before(:each) do
Elasticsearch::Client.send(:define_method, :ping) { } # define no-action ping method
allow_any_instance_of(Elasticsearch::Client).to receive(:info).and_return(cluster_info)
Expand Down Expand Up @@ -92,9 +99,11 @@

before do
allow(Elasticsearch::Client).to receive(:new).and_return(es_client)
allow(es_client).to receive(:info).and_raise(
Elasticsearch::Transport::Transport::Errors::BadRequest.new
)
if elastic_ruby_v8_client_available?
allow(es_client).to receive(:info).and_raise(Elastic::Transport::Transport::Errors::BadRequest.new)
else
allow(es_client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Errors::BadRequest.new)
end
end

it "raises an exception" do
Expand Down Expand Up @@ -744,8 +753,13 @@ def synchronize_method!(object, method_name)
it "should set host(s)" do
plugin.register
client = plugin.send(:client)

expect( client.transport.instance_variable_get(:@seeds) ).to eql [{
target_field = :@seeds
begin
Elasticsearch::Transport::Client
rescue
target_field = :@hosts
end
expect( client.transport.instance_variable_get(target_field) ).to eql [{
:scheme => "https",
:host => "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io",
:port => 9243,
Expand Down