github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Wait longer and more reliably for agent specs.

Browse source 
These agent specs occasionally time out. This removes our use of the unreliable Timeout gem
and also lengthens the waiting period before failure

Fixes #9639
This commit is contained in:
Andrew Cholakian 2018-05-22 13:47:43 -05:00
parent 042feafcad
commit 4c767c059e
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
logstash-core/spec/logstash/agent_spec.rb
View file

@ -27,7 +27,7 @@ describe LogStash::Agent do
sl sl
end end
let(:logger) { double("logger") } let(:logger) { double("logger") }
let(:timeout) {120} #seconds let(:timeout) {160} #seconds
subject { LogStash::Agent.new(agent_settings, default_source_loader) } subject { LogStash::Agent.new(agent_settings, default_source_loader) }
@ -133,9 +133,9 @@ describe LogStash::Agent do
it "does not upgrade the new config" do it "does not upgrade the new config" do
t = Thread.new { subject.execute } t = Thread.new { subject.execute }
Timeout.timeout(timeout) do wait(timeout)
sleep(0.01) until subject.running_pipelines? && subject.pipelines.values.first.ready? .for { subject.running_pipelines? && subject.pipelines.values.first.ready? }
end .to eq(true)
expect(subject.converge_state_and_update).not_to be_a_successful_converge expect(subject.converge_state_and_update).not_to be_a_successful_converge
expect(subject).to have_running_pipeline?(mock_config_pipeline) expect(subject).to have_running_pipeline?(mock_config_pipeline)
@ -384,11 +384,11 @@ describe LogStash::Agent do
before :each do before :each do
subject.converge_state_and_update subject.converge_state_and_update
Timeout.timeout(timeout) do
# wait for file existence otherwise it will raise exception on Windows # wait for file existence otherwise it will raise exception on Windows
sleep(0.1) until ::File.exist?(new_config_output) wait(timeout)
sleep(0.1) while ::File.read(new_config_output).chomp.empty? .for { ::File.exists?(new_config_output) && !::File.read(new_config_output).chomp.empty? }
end .to eq(true)
# ensure the converge_state_and_update method has updated metrics by # ensure the converge_state_and_update method has updated metrics by
# invoking the mutex # invoking the mutex
subject.running_pipelines? subject.running_pipelines?