fluentd 1.14.5 → 1.15.1

data/test/plugin/test_out_forward.rb

@@ -431,10 +431,12 @@ EOL
     ]
 
     stub(d.instance.ack_handler).read_ack_from_sock(anything).never
-    target_input_driver.run(expect_records: 2) do
-      d.run do
-        emit_events.each do |tag, t, record|
-          d.feed(tag, t, record)
+    assert_rr do
+      target_input_driver.run(expect_records: 2) do
+        d.run do
+          emit_events.each do |tag, t, record|
+            d.feed(tag, t, record)
+          end
         end
       end
     end
@@ -461,10 +463,12 @@ EOL
     ]
 
     stub(d.instance.ack_handler).read_ack_from_sock(anything).never
-    target_input_driver.run(expect_records: 2) do
-      d.run(default_tag: 'test') do
-        records.each do |record|
-          d.feed(time, record)
+    assert_rr do
+      target_input_driver.run(expect_records: 2) do
+        d.run(default_tag: 'test') do
+          records.each do |record|
+            d.feed(time, record)
+          end
         end
       end
     end
@@ -491,10 +495,12 @@ EOL
       {"a" => 2}
     ]
     stub(d.instance.ack_handler).read_ack_from_sock(anything).never
-    target_input_driver.run(expect_records: 2) do
-      d.run(default_tag: 'test') do
-        records.each do |record|
-          d.feed(time, record)
+    assert_rr do
+      target_input_driver.run(expect_records: 2) do
+        d.run(default_tag: 'test') do
+          records.each do |record|
+            d.feed(time, record)
+          end
         end
       end
     end
@@ -549,10 +555,12 @@ EOL
     ]
     # not attempt to receive responses
     stub(d.instance.ack_handler).read_ack_from_sock(anything).never
-    target_input_driver.run(expect_records: 2) do
-      d.run(default_tag: 'test') do
-        records.each do |record|
-          d.feed(time, record)
+    assert_rr do
+      target_input_driver.run(expect_records: 2) do
+        d.run(default_tag: 'test') do
+          records.each do |record|
+            d.feed(time, record)
+          end
         end
       end
     end
@@ -575,10 +583,12 @@ EOL
     ]
     # not attempt to receive responses
     stub(d.instance.ack_handler).read_ack_from_sock(anything).never
-    target_input_driver.run(expect_records: 2) do
-      d.run(default_tag: 'test') do
-        records.each do |record|
-          d.feed(time, record)
+    assert_rr do
+      target_input_driver.run(expect_records: 2) do
+        d.run(default_tag: 'test') do
+          records.each do |record|
+            d.feed(time, record)
+          end
         end
       end
     end

data/test/plugin/test_output_as_buffered_retries.rb

@@ -140,13 +140,13 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
 
       retry_state = @i.retry_state( @i.buffer_config.retry_randomize )
       retry_state.step
-      assert_equal 1, (retry_state.next_time - now)
-      retry_state.step
       assert_equal (1 * (2 ** 1)), (retry_state.next_time - now)
       retry_state.step
       assert_equal (1 * (2 ** 2)), (retry_state.next_time - now)
       retry_state.step
       assert_equal (1 * (2 ** 3)), (retry_state.next_time - now)
+      retry_state.step
+      assert_equal (1 * (2 ** 4)), (retry_state.next_time - now)
     end
 
     test 'does retries correctly when #write fails' do
@@ -332,7 +332,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
       @i.emit_events("test.tag.3", dummy_event_stream())
 
       logs = @i.log.out.logs
-      assert{ logs.any?{|l| l.include?("[error]: failed to flush the buffer, and hit limit for retries. dropping all chunks in the buffer queue.") } }
+      assert{ logs.any?{|l| l.include?("[error]: Hit limit for retries. dropping all chunks in the buffer queue.") } }
     end
 
     test 'output plugin give retries up by retry_max_times, and clear queue in buffer' do
@@ -409,7 +409,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
       @i.emit_events("test.tag.3", dummy_event_stream())
 
       logs = @i.log.out.logs
-      assert{ logs.any?{|l| l.include?("[error]: failed to flush the buffer, and hit limit for retries. dropping all chunks in the buffer queue.") && l.include?("retry_times=10") } }
+      assert{ logs.any?{|l| l.include?("[error]: Hit limit for retries. dropping all chunks in the buffer queue.") && l.include?("retry_times=10") } }
 
       assert{ @i.buffer.queue.size == 0 }
       assert{ @i.buffer.stage.size == 1 }
@@ -607,7 +607,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
       logs = @i.log.out.logs
 
       target_time = Time.parse("2016-04-13 18:35:31 -0700")
-      target_msg = "[error]: failed to flush the buffer, and hit limit for retries. dropping all chunks in the buffer queue."
+      target_msg = "[error]: Hit limit for retries. dropping all chunks in the buffer queue."
       assert{ logs.any?{|l| l.include?(target_msg) } }
 
       log_time = get_log_time(target_msg, logs)
@@ -695,7 +695,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
       @i.emit_events("test.tag.3", dummy_event_stream())
 
       logs = @i.log.out.logs
-      assert{ logs.any?{|l| l.include?("[error]: failed to flush the buffer, and hit limit for retries. dropping all chunks in the buffer queue.") && l.include?("retry_times=10") } }
+      assert{ logs.any?{|l| l.include?("[error]: Hit limit for retries. dropping all chunks in the buffer queue.") && l.include?("retry_times=10") } }
 
       assert{ @i.buffer.queue.size == 0 }
       assert{ @i.buffer.stage.size == 1 }
@@ -743,7 +743,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
 
       assert(@i.write_count == 1)
       assert(@i.num_errors == 1)
-      assert(@i.log.out.logs.any?{|l| l.include?("[error]: failed to flush the buffer, and hit limit for retries. dropping all chunks in the buffer queue.") && l.include?("retry_times=0") })
+      assert(@i.log.out.logs.any?{|l| l.include?("[error]: Hit limit for retries. dropping all chunks in the buffer queue.") && l.include?("retry_times=0") })
       assert(@i.buffer.queue.size == 0)
       assert(@i.buffer.stage.size == 1)
       assert(@i.buffer.queue.all?{|c| c.empty? })

data/test/plugin/test_output_as_buffered_secondary.rb

@@ -874,7 +874,7 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
       end
 
       logs = @i.log.out.logs
-      assert{ logs.any?{|l| l.include?("[error]: failed to flush the buffer, and hit limit for retries. dropping all chunks in the buffer queue.") } }
+      assert{ logs.any?{|l| l.include?("[error]: Hit limit for retries. dropping all chunks in the buffer queue.") } }
 
       assert{ now >= first_failure + 60 }
     end

data/test/plugin/test_parser_syslog.rb

@@ -644,7 +644,7 @@ class SyslogParserTest < ::Test::Unit::TestCase
 
   data('regexp' => :regexp, 'string' => :string)
   def test_parser_engine(engine)
-    d = @parser.configure({'parser_engine' => engine.to_s})
+    @parser.configure({'parser_engine' => engine.to_s})
     assert_equal(engine, @parser.instance.parser_engine)
   end
 end

data/test/plugin_helper/test_cert_option.rb

@@ -19,7 +19,7 @@ class CertOptionPluginHelperTest < Test::Unit::TestCase
   test 'raise an error for broken certificates_from_file file' do
     d = Dummy.new
     assert_raise Fluent::ConfigError do
-      certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/empty.pem")
+      d.cert_option_certificates_from_file("test/plugin_helper/data/cert/empty.pem")
     end
   end
 end

data/test/plugin_helper/test_child_process.rb

@@ -321,15 +321,21 @@ class ChildProcessTest < Test::Unit::TestCase
     ary = []
     arguments = ["okay"]
     Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
+      start_time = Fluent::Clock.now
       @d.child_process_execute(:t5, "echo", arguments: arguments, interval: 1, mode: [:read]) do |io|
         ary << io.read.split("\n").map(&:chomp).join
       end
-      sleep 2.9 # 2sec(second invocation) + 0.9sec
+      1.upto(2) do |i|
+        sleep 0.1 while ary.size < i
+        elapsed = Fluent::Clock.now - start_time
+        assert_equal(i, ary.size)
+        assert_true(elapsed > i && elapsed < i + 0.5,
+                    "actual elapsed: #{elapsed}")
+      end
       assert_equal [], @d.log.out.logs
       @d.stop
       assert_equal [], @d.log.out.logs
       @d.shutdown; @d.close; @d.terminate
-      assert_equal 2, ary.size
     end
   end
 
@@ -337,12 +343,18 @@ class ChildProcessTest < Test::Unit::TestCase
     ary = []
     arguments = ["okay"]
     Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
+      start_time = Fluent::Clock.now
       @d.child_process_execute(:t6, "echo", arguments: arguments, interval: 1, immediate: true, mode: [:read]) do |io|
         ary << io.read.split("\n").map(&:chomp).join
       end
-      sleep 1.9 # 1sec(second invocation) + 0.9sec
+      0.upto(1) do |i|
+        sleep 0.1 while ary.size < i + 1
+        elapsed = Fluent::Clock.now - start_time
+        assert_equal(i + 1, ary.size)
+        assert_true(elapsed > i && elapsed < i + 0.5,
+                    "actual elapsed: #{elapsed}")
+      end
       @d.stop; @d.shutdown; @d.close; @d.terminate
-      assert_equal 2, ary.size
       assert_equal [], @d.log.out.logs
     end
   end