fluentd 1.16.0 → 1.16.7

data/test/plugin/test_output_as_buffered.rb

@@ -510,7 +510,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       logs = @i.log.out.logs.dup
       @i.start
       @i.after_start
-      assert{ logs.select{|log| log.include?('[warn]') }.size == 0 }
+      assert{ logs.count{|log| log.include?('[warn]') } == 0 }
     end
 
     test 'a warning reported with 4 chunk keys' do
@@ -522,7 +522,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       @i.after_start
       assert_equal ['key1', 'key2', 'key3', 'key4'], @i.chunk_keys
 
-      assert{ logs.select{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') }.size == 1 }
+      assert{ logs.count{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') } == 1 }
     end
 
     test 'a warning reported with 4 chunk keys including "tag"' do
@@ -531,7 +531,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       logs = @i.log.out.logs.dup
       @i.start # this calls `log.reset`... capturing logs about configure must be done before this line
       @i.after_start
-      assert{ logs.select{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') }.size == 1 }
+      assert{ logs.count{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') } == 1 }
     end
 
     test 'time key is not included for warned chunk keys' do
@@ -540,7 +540,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       logs = @i.log.out.logs.dup
       @i.start
       @i.after_start
-      assert{ logs.select{|log| log.include?('[warn]') }.size == 0 }
+      assert{ logs.count{|log| log.include?('[warn]') } == 0 }
     end
   end
 
@@ -968,8 +968,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       waiting(4){ sleep 0.1 until ary.size == 3 }
 
       assert_equal 3, ary.size
-      assert_equal 2, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 1, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 2, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 1, ary.count{|e| e[0] == "test.tag.2" }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:04 +0900') )
 
@@ -985,8 +985,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 1 && @i.write_count == 2 }
 
       assert_equal 9, ary.size
-      assert_equal 7, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 2, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 7, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 2, ary.count{|e| e[0] == "test.tag.2" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1224,8 +1224,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:09 +0900') )
 
@@ -1249,8 +1249,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.write_count == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1315,8 +1315,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       @i.stop
       @i.before_shutdown
@@ -1330,8 +1330,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.buffer.queue.size == 0 && @i.write_count == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1435,8 +1435,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
       assert ary[0...5].all?{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:09 +0900') )
@@ -1465,11 +1465,11 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.write_count == 4 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
-      assert_equal 6, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }.size
-      assert_equal 3, ary.select{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }.size
-      assert_equal 2, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
+      assert_equal 6, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }
+      assert_equal 3, ary.count{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }
+      assert_equal 2, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1525,8 +1525,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       @i.stop
       @i.before_shutdown
@@ -1540,11 +1540,11 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.buffer.queue.size == 0 && @i.write_count == 4 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
-      assert_equal 6, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }.size
-      assert_equal 3, ary.select{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }.size
-      assert_equal 2, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
+      assert_equal 6, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }
+      assert_equal 3, ary.count{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }
+      assert_equal 2, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1683,8 +1683,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 1, chunks.size
       assert !chunks.first.empty?
@@ -1716,8 +1716,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.dequeued.size == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 3, chunks.size
       assert chunks.all?{|c| !c.empty? }
@@ -1802,8 +1802,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 1, chunks.size
       assert !chunks.first.empty?
@@ -1835,8 +1835,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.dequeued.size == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 3, chunks.size
       assert chunks.all?{|c| !c.empty? }
@@ -1892,8 +1892,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       assert{ @i.write_count == 7 }
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
       assert{ chunks.size == 3 }
       assert{ chunks.all?{|c| !c.empty? } }
 
@@ -1963,8 +1963,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 1, chunks.size
       assert !chunks.first.empty?
@@ -1999,8 +1999,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.rollback_count == 0 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert{ chunks.size == 3 }
       assert{ chunks.all?{|c| !c.empty? } }

data/test/plugin/test_output_as_buffered_compress.rb

@@ -35,6 +35,16 @@ module FluentPluginOutputAsBufferedCompressTest
       @format ? @format.call(tag, time, record) : [tag, time, record].to_json
     end
   end
+
+  def self.dummy_event_stream
+    Fluent::ArrayEventStream.new(
+      [
+        [event_time('2016-04-13 18:33:00'), { 'name' => 'moris', 'age' => 36, 'message' => 'data1' }],
+        [event_time('2016-04-13 18:33:13'), { 'name' => 'moris', 'age' => 36, 'message' => 'data2' }],
+        [event_time('2016-04-13 18:33:32'), { 'name' => 'moris', 'age' => 36, 'message' => 'data3' }],
+      ]
+    )
+  end
 end
 
 class BufferedOutputCompressTest < Test::Unit::TestCase
@@ -60,16 +70,6 @@ class BufferedOutputCompressTest < Test::Unit::TestCase
     end
   end
 
-  def dummy_event_stream
-    Fluent::ArrayEventStream.new(
-      [
-        [event_time('2016-04-13 18:33:00'), { 'name' => 'moris', 'age' => 36, 'message' => 'data1' }],
-        [event_time('2016-04-13 18:33:13'), { 'name' => 'moris', 'age' => 36, 'message' => 'data2' }],
-        [event_time('2016-04-13 18:33:32'), { 'name' => 'moris', 'age' => 36, 'message' => 'data3' }],
-      ]
-    )
-  end
-
   TMP_DIR = File.expand_path('../../tmp/test_output_as_buffered_compress', __FILE__)
 
   setup do
@@ -89,20 +89,34 @@ class BufferedOutputCompressTest < Test::Unit::TestCase
   end
 
   data(
-    handle_simple_stream: config_element('buffer', '', { 'flush_interval' => 1, 'compress' => 'gzip' }),
-    handle_stream_with_standard_format:  config_element('buffer', 'tag', { 'flush_interval' => 1, 'compress' => 'gzip' }),
-    handle_simple_stream_and_file_chunk: config_element('buffer', '', { '@type' => 'file', 'path' => File.join(TMP_DIR,'test.*.log'), 'flush_interval' => 1, 'compress' => 'gzip' }),
-    handle_stream_with_standard_format_and_file_chunk:  config_element('buffer', 'tag', { '@type' => 'file', 'path' => File.join(TMP_DIR,'test.*.log'), 'flush_interval' => 1, 'compress' => 'gzip' }),
+    :buffer_config,
+    [
+      config_element('buffer', '', { 'flush_interval' => 1, 'compress' => 'gzip' }),
+      config_element('buffer', 'tag', { 'flush_interval' => 1, 'compress' => 'gzip' }),
+      config_element('buffer', '', { '@type' => 'file', 'path' => File.join(TMP_DIR,'test.*.log'), 'flush_interval' => 1, 'compress' => 'gzip' }),
+      config_element('buffer', 'tag', { '@type' => 'file', 'path' => File.join(TMP_DIR,'test.*.log'), 'flush_interval' => 1, 'compress' => 'gzip' }),
+    ],
   )
-  test 'call a standard format when output plugin adds data to chunk' do |buffer_config|
+  data(
+    :input_es,
+    [
+      FluentPluginOutputAsBufferedCompressTest.dummy_event_stream,
+      # If already compressed data is incoming, it must be written as is (i.e. without decompressed).
+      # https://github.com/fluent/fluentd/issues/4146
+      Fluent::CompressedMessagePackEventStream.new(FluentPluginOutputAsBufferedCompressTest.dummy_event_stream.to_compressed_msgpack_stream),
+    ],
+  )
+  test 'call a standard format when output plugin adds data to chunk' do |data|
+    buffer_config = data[:buffer_config]
+    es = data[:input_es].dup # Note: the data matrix is shared in all patterns, so we need `dup` here.
+
     @i = create_output(:async)
     @i.configure(config_element('ROOT','', {}, [buffer_config]))
     @i.start
     @i.after_start
 
     io = StringIO.new
-    es = dummy_event_stream
-    expected = es.map { |e| e }
+    expected = es.dup.map { |t, r| [t, r] }
     compressed_data = ''
 
     assert_equal :gzip, @i.buffer.compress
@@ -138,7 +152,7 @@ class BufferedOutputCompressTest < Test::Unit::TestCase
     @i.after_start
 
     io = StringIO.new
-    es = dummy_event_stream
+    es = FluentPluginOutputAsBufferedCompressTest.dummy_event_stream
     expected = es.map { |e| "#{e[1]}\n" }.join # e[1] is record
     compressed_data = ''
 

data/test/plugin/test_output_as_buffered_retries.rb

@@ -93,7 +93,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
   end
   def get_log_time(msg, logs)
     log_time = nil
-    log = logs.select{|l| l.include?(msg) }.first
+    log = logs.find{|l| l.include?(msg) }
     if log && /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-+]\d{4}) \[error\]/ =~ log
       log_time = Time.parse($1)
     end

data/test/plugin/test_output_as_buffered_secondary.rb

@@ -634,8 +634,8 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       assert @i.retry
       logs = @i.log.out.logs
-      waiting(4){ sleep 0.1 until logs.select{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") }.size == 2 }
-      assert{ logs.select{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") }.size == 2 }
+      waiting(4){ sleep 0.1 until logs.count{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") } == 2 }
+      assert{ logs.count{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") } == 2 }
     end
 
     test 'retry_wait for secondary is same with one for primary' do

data/test/plugin/test_parser_json.rb

@@ -8,6 +8,37 @@ class JsonParserTest < ::Test::Unit::TestCase
     @parser = Fluent::Test::Driver::Parser.new(Fluent::Plugin::JSONParser)
   end
 
+  sub_test_case "configure_json_parser" do
+    data("oj", [:oj, [Oj.method(:load), Oj::ParseError]])
+    data("json", [:json, [JSON.method(:load), JSON::ParserError]])
+    data("yajl", [:yajl, [Yajl.method(:load), Yajl::ParseError]])
+    def test_return_each_loader((input, expected_return))
+      result = @parser.instance.configure_json_parser(input)
+      assert_equal expected_return, result
+    end
+
+    def test_raise_exception_for_unknown_input
+      assert_raise RuntimeError do
+        @parser.instance.configure_json_parser(:unknown)
+      end
+    end
+
+    def test_fall_back_oj_to_yajl_if_oj_not_available
+      stub(Fluent::OjOptions).available? { false }
+
+      result = @parser.instance.configure_json_parser(:oj)
+
+      assert_equal [Yajl.method(:load), Yajl::ParseError], result
+      logs = @parser.logs.collect do |log|
+        log.gsub(/\A\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-+]\d{4} /, "")
+      end
+      assert_equal(
+        ["[info]: Oj is not installed, and failing back to Yajl for json parser\n"],
+        logs
+      )
+    end
+  end
+
   data('oj' => 'oj', 'yajl' => 'yajl')
   def test_parse(data)
     @parser.configure('json_parser' => data)

data/test/plugin_helper/test_child_process.rb

@@ -515,6 +515,9 @@ class ChildProcessTest < Test::Unit::TestCase
   end
 
   test 'can scrub characters without exceptions' do
+    if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('3.3.0')
+      pend "Behaviour of IO#set_encoding is changed as of Ruby 3.3 (#4058)"
+    end
     m = Mutex.new
     str = nil
     Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
@@ -529,19 +532,25 @@ class ChildProcessTest < Test::Unit::TestCase
       sleep TEST_WAIT_INTERVAL_FOR_BLOCK_RUNNING until m.locked? || ran
       m.lock
       assert_equal Encoding.find('utf-8'), str.encoding
-      expected = "\xEF\xBF\xBD\xEF\xBF\xBD\x00\xEF\xBF\xBD\xEF\xBF\xBD".force_encoding("utf-8")
+      replacement = "\uFFFD" # U+FFFD (REPLACEMENT CHARACTER)
+      nul = "\x00" # U+0000 (NUL)
+      expected = replacement * 2 + nul + replacement * 2
       assert_equal expected, str
       @d.stop; @d.shutdown; @d.close; @d.terminate
     end
   end
 
   test 'can scrub characters without exceptions and replace specified chars' do
+    if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('3.3.0')
+      pend "Behaviour of IO#set_encoding is changed as of Ruby 3.3 (#4058)"
+    end
     m = Mutex.new
     str = nil
+    replacement = "?"
     Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
       ran = false
       args = ['-e', 'STDOUT.set_encoding("ascii-8bit"); STDOUT.write "\xFF\xFF\x00\xF0\xF0"']
-      @d.child_process_execute(:t13b, "ruby", arguments: args, mode: [:read], scrub: true, replace_string: '?') do |io|
+      @d.child_process_execute(:t13b, "ruby", arguments: args, mode: [:read], scrub: true, replace_string: replacement) do |io|
         m.lock
         ran = true
         str = io.read
@@ -550,7 +559,8 @@ class ChildProcessTest < Test::Unit::TestCase
       sleep TEST_WAIT_INTERVAL_FOR_BLOCK_RUNNING until m.locked? || ran
       m.lock
       assert_equal Encoding.find('utf-8'), str.encoding
-      expected = "??\x00??".force_encoding("utf-8")
+      nul = "\x00" # U+0000 (NUL)
+      expected = replacement * 2 + nul + replacement * 2
       assert_equal expected, str
       @d.stop; @d.shutdown; @d.close; @d.terminate
     end
@@ -559,7 +569,7 @@ class ChildProcessTest < Test::Unit::TestCase
   unless Fluent.windows?
     test 'can specify subprocess name' do
       io = IO.popen([["cat", "caaaaaaaaaaat"], '-'])
-      process_naming_enabled = (open("|ps opid,cmd"){|_io| _io.readlines }.select{|line| line.include?("caaaaaaaaaaat") }.size > 0)
+      process_naming_enabled = (open("|ps opid,cmd"){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
       Process.kill(:TERM, io.pid) rescue nil
       io.close rescue nil
 
@@ -584,7 +594,7 @@ class ChildProcessTest < Test::Unit::TestCase
         m.lock
         pid = pids.first
         # 16357 sleeeeeeeeeper -e sleep 10; puts "hello"
-        assert{ proc_lines.select{|line| line =~ /^\s*#{pid}\s/ }.first.strip.split(/\s+/)[1] == "sleeeeeeeeeper" }
+        assert{ proc_lines.find{|line| line =~ /^\s*#{pid}\s/ }.strip.split(/\s+/)[1] == "sleeeeeeeeeper" }
         @d.stop; @d.shutdown; @d.close; @d.terminate
       end
     end

data/test/plugin_helper/test_http_server_helper.rb

@@ -14,7 +14,7 @@ class HttpHelperTest < Test::Unit::TestCase
   CERT_CA_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/with_ca')
 
   def setup
-    @port = unused_port
+    @port = unused_port(protocol: :tcp)
   end
 
   def teardown