fluentd 0.10.57 → 0.10.58

data/test/config/test_types.rb

@@ -0,0 +1,63 @@
+require 'helper'
+require 'fluent/config/types'
+
+class TestConfigTypes < ::Test::Unit::TestCase
+  include Fluent
+
+  sub_test_case 'Config.size_value' do
+    test 'normal case' do
+      assert_equal(2048, Config.size_value("2k"))
+      assert_equal(2048, Config.size_value("2K"))
+      assert_equal(3145728, Config.size_value("3m"))
+      assert_equal(3145728, Config.size_value("3M"))
+      assert_equal(4294967296, Config.size_value("4g"))
+      assert_equal(4294967296, Config.size_value("4G"))
+      assert_equal(5497558138880, Config.size_value("5t"))
+      assert_equal(5497558138880, Config.size_value("5T"))
+      assert_equal(6, Config.size_value("6"))
+    end
+
+    test 'not assumed case' do
+      assert_equal(6, Config.size_value(6))
+      assert_equal(0, Config.size_value("hoge"))
+      assert_equal(0, Config.size_value(""))
+      assert_equal(0, Config.size_value(nil))
+    end
+  end
+
+  sub_test_case 'Config.time_value' do
+    test 'normal case' do
+      assert_equal(10, Config.time_value("10s"))
+      assert_equal(10, Config.time_value("10sec"))
+      assert_equal(120, Config.time_value("2m"))
+      assert_equal(10800, Config.time_value("3h"))
+      assert_equal(345600, Config.time_value("4d"))
+    end
+
+    test 'not assumed case' do
+      assert_equal(4.0, Config.time_value(4))
+      assert_equal(0.4, Config.time_value(0.4))
+      assert_equal(0.0, Config.time_value("hoge"))
+      assert_equal(0.0, Config.time_value(""))
+      assert_equal(0.0, Config.time_value(nil))
+    end
+  end
+
+  sub_test_case 'Config.bool_value' do
+    test 'normal case' do
+      assert_true Config.bool_value("true")
+      assert_true Config.bool_value("yes")
+      assert_true Config.bool_value("")
+      assert_false Config.bool_value("false")
+      assert_false Config.bool_value("no")
+    end
+
+    test 'not assumed case' do
+      assert_true Config.bool_value(true)
+      assert_false Config.bool_value(false)
+      assert_nil Config.bool_value("hoge")
+      assert_nil Config.bool_value(nil)
+      assert_nil Config.bool_value(10)
+    end
+  end
+end

data/test/plugin/test_in_dummy.rb

@@ -0,0 +1,95 @@
+require_relative '../helper'
+require 'fluent/test'
+
+class DummyTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  def create_driver(conf)
+    Fluent::Test::InputTestDriver.new(Fluent::DummyInput).configure(conf)
+  end
+
+  sub_test_case 'configure' do
+    test 'required parameters' do
+      assert_raise_message("'tag' parameter is required") do
+        create_driver('')
+      end
+    end
+
+    test 'tag' do
+      d = create_driver(%[
+        tag dummy
+      ])
+      assert_equal "dummy", d.instance.tag
+    end
+
+    config = %[
+      tag dummy
+    ]
+
+    test 'auto_increment_key' do
+      d = create_driver(config + %[
+        auto_increment_key id
+      ])
+      assert_equal "id", d.instance.auto_increment_key
+    end
+
+    test 'rate' do
+      d = create_driver(config + %[
+        rate 10
+      ])
+      assert_equal 10, d.instance.rate
+    end
+
+    test 'dummy' do
+      # hash is okay
+      d = create_driver(config + %[dummy {"foo":"bar"}])
+      assert_equal [{"foo"=>"bar"}], d.instance.dummy
+
+      # array of hash is okay
+      d = create_driver(config + %[dummy [{"foo":"bar"}]])
+      assert_equal [{"foo"=>"bar"}], d.instance.dummy
+
+      assert_raise_message(/JSON::ParserError|got incomplete JSON/) do
+        create_driver(config + %[dummy "foo"])
+      end
+
+      assert_raise_message(/is not a hash/) do
+        create_driver(config + %[dummy ["foo"]])
+      end
+    end
+  end
+
+  sub_test_case "emit" do
+    config = %[
+      tag dummy
+      rate 10
+      dummy {"foo":"bar"}
+    ]
+
+    test 'simple' do
+      d = create_driver(config)
+      d.run {
+        # d.run sleeps 0.5 sec
+      }
+      emits = d.emits
+      emits.each do |tag, time, record|
+        assert_equal("dummy", tag)
+        assert_equal({"foo"=>"bar"}, record)
+      end
+    end
+
+    test 'with auto_increment_key' do
+      d = create_driver(config + %[auto_increment_key id])
+      d.run {
+        # d.run sleeps 0.5 sec
+      }
+      emits = d.emits
+      emits.each_with_index do |(tag, time, record), i|
+        assert_equal("dummy", tag)
+        assert_equal({"foo"=>"bar", "id"=>i}, record)
+      end
+    end
+  end
+end

data/test/plugin/test_in_exec.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 require 'net/http'
 
 class ExecInputTest < Test::Unit::TestCase

data/test/plugin/test_in_forward.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'helper'
+require_relative '../helper'
 
 class ForwardInputTest < Test::Unit::TestCase
   def setup

data/test/plugin/test_in_gc_stat.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 
 class GCStatInputTest < Test::Unit::TestCase
   def setup

data/test/plugin/test_in_http.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'helper'
+require_relative '../helper'
 require 'net/http'
 
 class HttpInputTest < Test::Unit::TestCase
@@ -13,6 +12,7 @@ class HttpInputTest < Test::Unit::TestCase
     bind "127.0.0.1"
     body_size_limit 10m
     keepalive_timeout 5
+    respond_with_empty_img true
   ]
 
   def create_driver(conf=CONFIG)
@@ -199,6 +199,81 @@ class HttpInputTest < Test::Unit::TestCase
     end
   end
 
+  def test_resonse_with_empty_img
+    d = create_driver(CONFIG + "respond_with_empty_img true")
+    assert_equal true, d.instance.respond_with_empty_img
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+
+    d.expect_emit "tag1", time, {"a"=>1}
+    d.expect_emit "tag2", time, {"a"=>2}
+
+    d.run do
+      d.expected_emits.each {|tag,time,record|
+        res = post("/#{tag}", {"json"=>record.to_json, "time"=>time.to_s})
+        assert_equal "200", res.code
+        # Ruby returns ASCII-8 encoded string for GIF.
+        assert_equal Fluent::HttpInput::EMPTY_GIF_IMAGE, res.body.force_encoding("UTF-8")
+      }
+    end
+  end
+
+  def test_if_content_type_is_initialized_properly
+    # This test is to check if Fluent::HttpInput::Handler's @content_type is initialized properly.
+    # Especially when in Keep-Alive and the second request has no 'Content-Type'.
+    #
+    # Actually, in the current implementation of in_http, we can't test it directly.
+    # So we replace Fluent::HttpInput::Handler temporally with the extended Handler
+    # in order to collect @content_type(s) per request.
+    # Finally, we check those collected @content_type(s).
+
+    # Save the original Handler
+    orig_handler = Fluent::HttpInput::Handler
+
+    begin
+      # Create the extended Handler which can store @content_type per request
+      ext_handler = Class.new(Fluent::HttpInput::Handler) do
+        @@content_types = []
+
+        def self.content_types
+          @@content_types
+        end
+
+        def on_message_complete
+          @@content_types << @content_type
+          super
+        end
+      end
+
+      # Replace the original Handler temporally with the extended one
+      Fluent::HttpInput.module_eval do
+        remove_const(:Handler) if const_defined?(:Handler)
+        const_set(:Handler, ext_handler)
+      end
+
+      d = create_driver
+
+      d.run do
+        # Send two requests the second one has no Content-Type in Keep-Alive
+        Net::HTTP.start("127.0.0.1", PORT) do |http|
+          req = Net::HTTP::Post.new("/foodb/bartbl", {"connection" => "keepalive", "content-type" => "application/json"})
+          res = http.request(req)
+
+          req = Net::HTTP::Get.new("/foodb/bartbl", {"connection" => "keepalive"})
+          res = http.request(req)
+        end
+
+        assert_equal(['application/json', ''], ext_handler.content_types)
+      end
+    ensure
+      # Revert the original Handler
+      Fluent::HttpInput.module_eval do
+        remove_const(:Handler) if const_defined?(:Handler)
+        const_set(:Handler, orig_handler)
+      end
+    end
+  end
+
   def post(path, params, header = {})
     http = Net::HTTP.new("127.0.0.1", PORT)
     req = Net::HTTP::Post.new(path, header)

data/test/plugin/test_in_object_space.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 
 class ObjectSpaceInputTest < Test::Unit::TestCase
   class FailObject

data/test/plugin/test_in_status.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 
 class StatusInputTest < Test::Unit::TestCase
   def setup

data/test/plugin/test_in_stream.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'helper'
+require_relative '../helper'
 
 module StreamInputTest
   def setup

data/test/plugin/test_in_syslog.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'helper'
+require_relative '../helper'
 
 class SyslogInputTest < Test::Unit::TestCase
   def setup

data/test/plugin/test_in_tail.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 require 'net/http'
 require 'flexmock'
 

data/test/plugin/test_in_tcp.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'helper'
+require_relative '../helper'
 
 class TcpInputTest < Test::Unit::TestCase
   def setup

data/test/plugin/test_in_udp.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'helper'
+require_relative '../helper'
 
 class UdpInputTest < Test::Unit::TestCase
   def setup

data/test/plugin/test_out_copy.rb

@@ -1,6 +1,17 @@
-require 'fluent/test'
+require_relative '../helper'
 
 class CopyOutputTest < Test::Unit::TestCase
+  class << self
+    def startup
+      $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'scripts'))
+      require 'fluent/plugin/out_test'
+    end
+
+    def shutdown
+      $LOAD_PATH.shift
+    end
+  end
+
   def setup
     Fluent::Test.setup
   end

data/test/plugin/test_out_exec.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 require 'fileutils'
 
 class ExecOutputTest < Test::Unit::TestCase

data/test/plugin/test_out_exec_filter.rb

@@ -1,4 +1,4 @@
-require 'fluent/test'
+require_relative '../helper'
 require 'fileutils'
 
 class ExecFilterOutputTest < Test::Unit::TestCase

data/test/plugin/test_out_file.rb

@@ -1,3 +1,4 @@
+require_relative '../helper'
 require 'fluent/test'
 require 'fileutils'
 require 'time'
@@ -125,7 +126,7 @@ class FileOutputTest < Test::Unit::TestCase
 
     # FileOutput#write returns path
     path = d.run
-    expect_path = "#{TMP_DIR}/out_file_test._0.log.gz"
+    expect_path = "#{TMP_DIR}/out_file_test.20110102_0.log.gz"
     assert_equal expect_path, path
 
     check_gzipped_result(path, %[2011-01-02T13:14:15Z\ttest\t{"a":1}\n] + %[2011-01-02T13:14:15Z\ttest\t{"a":2}\n])
@@ -177,13 +178,13 @@ class FileOutputTest < Test::Unit::TestCase
 
     # FileOutput#write returns path
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test._0.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test.20110102_0.log.gz", path
     check_gzipped_result(path, formatted_lines)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test._1.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test.20110102_1.log.gz", path
     check_gzipped_result(path, formatted_lines)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test._2.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test.20110102_2.log.gz", path
     check_gzipped_result(path, formatted_lines)
   end
 
@@ -202,13 +203,13 @@ class FileOutputTest < Test::Unit::TestCase
 
     # FileOutput#write returns path
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test..log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test.20110102.log.gz", path
     check_gzipped_result(path, formatted_lines)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test..log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test.20110102.log.gz", path
     check_gzipped_result(path, formatted_lines * 2)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test..log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test.20110102.log.gz", path
     check_gzipped_result(path, formatted_lines * 3)
   end
 
@@ -240,5 +241,58 @@ class FileOutputTest < Test::Unit::TestCase
       FileUtils.rm_rf(symlink_path)
     end
   end
+
+  sub_test_case 'path' do
+    test 'normal' do
+      d = create_driver(%[
+        path #{TMP_DIR}/out_file_test
+        time_slice_format %Y-%m-%d-%H
+        utc true
+      ])
+      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+      d.emit({"a"=>1}, time)
+      # FileOutput#write returns path
+      path = d.run
+      assert_equal "#{TMP_DIR}/out_file_test.2011-01-02-13_0.log", path
+    end
+
+    test 'normal with append' do
+      d = create_driver(%[
+        path #{TMP_DIR}/out_file_test
+        time_slice_format %Y-%m-%d-%H
+        utc true
+        append true
+      ])
+      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+      d.emit({"a"=>1}, time)
+      path = d.run
+      assert_equal "#{TMP_DIR}/out_file_test.2011-01-02-13.log", path
+    end
+
+    test '*' do
+      d = create_driver(%[
+        path #{TMP_DIR}/out_file_test.*.txt
+        time_slice_format %Y-%m-%d-%H
+        utc true
+      ])
+      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+      d.emit({"a"=>1}, time)
+      path = d.run
+      assert_equal "#{TMP_DIR}/out_file_test.2011-01-02-13_0.txt", path
+    end
+
+    test '* with append' do
+      d = create_driver(%[
+        path #{TMP_DIR}/out_file_test.*.txt
+        time_slice_format %Y-%m-%d-%H
+        utc true
+        append true
+      ])
+      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+      d.emit({"a"=>1}, time)
+      path = d.run
+      assert_equal "#{TMP_DIR}/out_file_test.2011-01-02-13.txt", path
+    end
+  end
 end