nxy

Author: robbavey

spec/filewatch/rotate_spec.rb

@@ -193,19 +193,19 @@ module FileWatch
       let(:listener2) { observer.listener_for(second_file.to_path) }
       let(:actions) do
         RSpec::Sequencing
-          .run_after(0.25, "create original - write line 1, 66 bytes") do
+          .run_after(1.5, "create original - write line 1, 66 bytes") do
             file_path.open("wb") { |file|  file.write("#{line1}\n") }
           end
-          .then_after(0.25, "rename to 2.log") do
+          .then_after(1.5, "rename to 2.log") do
             file_path.rename(second_file)
             file_path.open("wb") { |file|  file.write("#{line2}\n") }
           end
-          .then_after(0.25, "rename to 2.log again") do
+          .then_after(1.5, "rename to 2.log again") do
             file_path.rename(second_file)
             file_path.open("wb") { |file|  file.write("#{line3}\n") }
           end
           .then("wait for expectations to be met") do
-            wait(0.5).for{listener1.lines.size == 3 && listener2.lines.empty?}.to eq(true)
+            wait(1).for{listener1.lines.size == 3 && listener2.lines.empty?}.to eq(true)
           end
           .then("quit") do
             tailing.quit

spec/filewatch/tailing_spec.rb

@@ -482,7 +482,7 @@ module FileWatch
             tailing.watch_this(watch_dir)
           end
           .then("wait for lines") do
-            wait(1.5).for{listener1.calls}.to eq([:open, :accept, :accept, :timed_out])
+            wait(2.5).for{listener1.calls}.to eq([:open, :accept, :accept, :timed_out])
           end
           .then("quit") do
             tailing.quit

spec/inputs/file_read_spec.rb

@@ -284,7 +284,10 @@
       wait_for_start_processing(@run_thread)
     end
 
-    after { plugin.stop }
+    after {
+      plugin.stop
+      @run_thread.join
+    }
 
     it 'processes a file' do
       wait_for_file_removal(sample_file) # watched discovery
@@ -330,7 +333,10 @@
       wait_for_start_processing(@run_thread)
     end
 
-    after { plugin.stop }
+    after {
+      plugin.stop
+      @run_thread.join
+    }
 
     it 'cleans up sincedb entry' do
       wait_for_file_removal(sample_file) # watched discovery
@@ -350,7 +356,7 @@
 
   private
 
-  def wait_for_start_processing(run_thread, timeout: 1.0)
+  def wait_for_start_processing(run_thread, timeout: 10.0)
     begin
       Timeout.timeout(timeout) do
         # sleep(0.01) while run_thread.status != 'sleep'
@@ -363,7 +369,13 @@ def wait_for_start_processing(run_thread, timeout: 1.0)
           sleep(0.1)
           puts "no queue"
         end
-      end
+        puts "the queue size is #{plugin.queue.size}"
+          # sleep(0.1) while !plugin.queue
+          while plugin.queue.size == 0
+            sleep(0.1)
+            puts "no item on queue"
+          end
+        end
     rescue Timeout::Error => e
       puts "plugin timed out #{e}"
       raise "plugin did not start processing (timeout: #{timeout})" unless plugin.queue