adjust the agent and the converge spec for the system pipeline

Fixes #6885
This commit is contained in:
Pier-Hugues Pellerin 2017-04-21 15:53:46 -04:00
parent 3eaf208c1d
commit 5379065249
2 changed files with 1 additions and 11 deletions

View file

@ -59,16 +59,6 @@ describe LogStash::Agent do
end
end
context "#running_user_defined_pipelines?" do
let(:finite_pipeline_config) { mock_pipeline_config(:main, "input { generator { count => 1 } } output { null {} }") }
it "returns false" do
agent_task = start_agent(subject)
expect(subject.running_user_defined_pipelines?).to be_falsey
subject.shutdown
end
end
context "system pipeline" do
let(:finite_pipeline_config) { mock_pipeline_config(:main, "input { generator { count => 1000 } } output { null {} }") }
let(:system_pipeline_config) { mock_pipeline_config(:system_pipeline, "input { generator { } } output { null {} }", { "pipeline.system" => true }) }

View file

@ -111,7 +111,7 @@ describe LogStash::Agent do
context "if state is clean" do
before :each do
allow(subject).to receive(:running_pipelines?).and_return(true)
allow(subject).to receive(:running_user_defined_pipelines?).and_return(true)
allow(subject).to receive(:clean_state?).and_return(false)
end