From 4c767c059e5cff0e348d7f47e2ee635da9098f82 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrew@andrewvc.com>
Date: Tue, 22 May 2018 13:47:43 -0500
Subject: [PATCH] Wait longer and more reliably for agent specs.

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
---
 logstash-core/spec/logstash/agent_spec.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/logstash-core/spec/logstash/agent_spec.rb b/logstash-core/spec/logstash/agent_spec.rb
index 6588347ae..2a6291578 100644
--- a/logstash-core/spec/logstash/agent_spec.rb
+++ b/logstash-core/spec/logstash/agent_spec.rb
@@ -27,7 +27,7 @@ describe LogStash::Agent do
     sl
   end
   let(:logger) { double("logger") }
-  let(:timeout) {120} #seconds
+  let(:timeout) {160} #seconds
 
   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
             t = Thread.new { subject.execute }
-            Timeout.timeout(timeout) do
-              sleep(0.01) until subject.running_pipelines? && subject.pipelines.values.first.ready?
-            end
+            wait(timeout)
+                .for { subject.running_pipelines? && subject.pipelines.values.first.ready? }
+                .to eq(true)
             expect(subject.converge_state_and_update).not_to be_a_successful_converge
             expect(subject).to have_running_pipeline?(mock_config_pipeline)
 
@@ -384,11 +384,11 @@ describe LogStash::Agent do
 
       before :each do
         subject.converge_state_and_update
-        Timeout.timeout(timeout) do
-          # wait for file existence otherwise it will raise exception on Windows
-          sleep(0.1) until ::File.exist?(new_config_output)
-          sleep(0.1) while ::File.read(new_config_output).chomp.empty?
-        end
+
+        # wait for file existence otherwise it will raise exception on Windows
+        wait(timeout)
+          .for { ::File.exists?(new_config_output) && !::File.read(new_config_output).chomp.empty? }
+          .to eq(true)
         # ensure the converge_state_and_update method has updated metrics by
         # invoking the mutex
         subject.running_pipelines?