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

make the plugin incompatibility tests less deterministic

Browse source 
Fixes #5175
This commit is contained in:
Joao Duarte 2016-04-22 10:58:47 +01:00 • committed by João Duarte
parent 352cba818d
commit 971c2db91d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ describe LogStash::Agent do
context "with a config that contains reload incompatible plugins" do
let(:second_pipeline_config) { "input { stdin {} } filter { } output { }" }
it "does not reload if new config contains reload incompatible plugins" do
it "does not upgrade the new config" do
t = Thread.new { subject.execute }
sleep 0.01 until subject.running_pipelines? && subject.pipelines.values.first.ready?
expect(subject).to_not receive(:upgrade_pipeline)
@ -97,10 +97,10 @@ describe LogStash::Agent do
context "with a config that does not contain reload incompatible plugins" do
let(:second_pipeline_config) { "input { generator { } } filter { } output { }" }
it "does not reload if new config contains reload incompatible plugins" do
it "does upgrade the new config" do
t = Thread.new { subject.execute }
sleep 0.01 until subject.running_pipelines? && subject.pipelines.values.first.ready?
expect(subject).to receive(:upgrade_pipeline)
expect(subject).to receive(:upgrade_pipeline).once.and_call_original
File.open(config_file, "w") { |f| f.puts second_pipeline_config }
subject.send(:reload_state!)
sleep 0.1
@ -136,7 +136,7 @@ describe LogStash::Agent do
context "with a config that contains reload incompatible plugins" do
let(:second_pipeline_config) { "input { stdin {} } filter { } output { }" }
it "does not reload if new config contains reload incompatible plugins" do
it "does not upgrade the new config" do
t = Thread.new { subject.execute }
sleep 0.01 until subject.running_pipelines? && subject.pipelines.values.first.ready?
expect(subject).to_not receive(:upgrade_pipeline)
@ -150,10 +150,10 @@ describe LogStash::Agent do
context "with a config that does not contain reload incompatible plugins" do
let(:second_pipeline_config) { "input { generator { } } filter { } output { }" }
it "does not reload if new config contains reload incompatible plugins" do
it "does upgrade the new config" do
t = Thread.new { subject.execute }
sleep 0.01 until subject.running_pipelines? && subject.pipelines.values.first.ready?
expect(subject).to receive(:upgrade_pipeline).at_least(2).times
expect(subject).to receive(:upgrade_pipeline).once.and_call_original
File.open(config_file, "w") { |f| f.puts second_pipeline_config }
sleep 0.1
Stud.stop!(t)