Add more generous try timeout for multiple pipelines specs

Fixes elastic#9225

Author: andrewvc

logstash-core/spec/logstash/agent_spec.rb

@@ -132,14 +132,9 @@
 
           it "does not upgrade the new config" do
             t = Thread.new { subject.execute }
-<<<<<<< HEAD
-            sleep(0.01) until subject.with_pipelines {|pipelines| subject.running_pipelines? && pipelines.values.first.ready? }
-
-=======
             Timeout.timeout(timeout) do
               sleep(0.01) until subject.running_pipelines? && subject.pipelines.values.first.ready?
             end
->>>>>>> a1c0e417e5... Support for inter-pipeline comms with a new pipeline input/output
             expect(subject.converge_state_and_update).not_to be_a_successful_converge
             expect(subject).to have_running_pipeline?(mock_config_pipeline)
 
@@ -157,13 +152,9 @@
 
           it "does upgrade the new config" do
             t = Thread.new { subject.execute }
-<<<<<<< HEAD
-            sleep(0.01) until subject.with_pipelines {|pipelines| subject.pipelines_count > 0 && pipelines.values.first.ready? }
-=======
             Timeout.timeout(timeout) do
               sleep(0.01) until subject.pipelines_count > 0 && subject.pipelines.values.first.ready?
             end
->>>>>>> a1c0e417e5... Support for inter-pipeline comms with a new pipeline input/output
 
             expect(subject.converge_state_and_update).to be_a_successful_converge
             expect(subject).to have_running_pipeline?(mock_second_pipeline_config)
@@ -185,14 +176,9 @@
 
           it "does not try to reload the pipeline" do
             t = Thread.new { subject.execute }
-<<<<<<< HEAD
-            sleep(0.01) until subject.with_pipelines {|pipelines| subject.running_pipelines? && pipelines.values.first.running? }
-
-=======
             Timeout.timeout(timeout) do
               sleep(0.01) until subject.running_pipelines? && subject.pipelines.values.first.running?
             end
->>>>>>> a1c0e417e5... Support for inter-pipeline comms with a new pipeline input/output
             expect(subject.converge_state_and_update).not_to be_a_successful_converge
             expect(subject).to have_running_pipeline?(mock_config_pipeline)
 
@@ -210,13 +196,9 @@
 
           it "tries to reload the pipeline" do
             t = Thread.new { subject.execute }
-<<<<<<< HEAD
-            sleep(0.01) until subject.with_pipelines {|pipelines| subject.running_pipelines? && pipelines.values.first.running? }
-=======
             Timeout.timeout(timeout) do
               sleep(0.01) until subject.running_pipelines? && subject.pipelines.values.first.running?
             end
->>>>>>> a1c0e417e5... Support for inter-pipeline comms with a new pipeline input/output
 
             expect(subject.converge_state_and_update).to be_a_successful_converge
             expect(subject).to have_running_pipeline?(mock_second_pipeline_config)

qa/integration/specs/multiple_pipeline_spec.rb

@@ -37,7 +37,7 @@
   let!(:pipelines_yaml) { pipelines.to_yaml }
   let!(:pipelines_yaml_file) { ::File.join(settings_dir, "pipelines.yml") }
 
-  let(:retry_attempts) { 30 }
+  let(:retry_attempts) { 40 }
 
   before(:each) do
     IO.write(pipelines_yaml_file, pipelines_yaml)