fluentd 0.10.62 → 0.12.0.pre.1

data/spec/config/section_spec.rb

@@ -0,0 +1,97 @@
+require 'fluent/config/section'
+
+describe Fluent::Config::Section do
+  context 'class' do
+    describe '.name' do
+      it 'returns its full module name as String' do
+        expect(Fluent::Config::Section.name).to eql('Fluent::Config::Section')
+      end
+    end
+  end
+
+  context 'instance object' do
+    describe '#initialize' do
+      it 'creates blank object without argument' do
+        s = Fluent::Config::Section.new
+        expect(s.instance_eval{ @params }).to eql({})
+      end
+
+      it 'creates object which contains specified hash object itself' do
+        hash = {
+          name: 'tagomoris',
+          age: 34,
+          send: 'email',
+          class: 'normal',
+          keys: 5,
+        }
+        s1 = Fluent::Config::Section.new(hash)
+        expect(s1.instance_eval{ @params }).to eq(hash)
+        expect(s1[:name]).to eql("tagomoris")
+        expect(s1[:age]).to eql(34)
+        expect(s1[:send]).to eql("email")
+        expect(s1[:class]).to eql("normal")
+        expect(s1[:keys]).to eql(5)
+
+        expect(s1.name).to eql("tagomoris")
+        expect(s1.age).to eql(34)
+        expect(s1.send).to eql("email")
+        expect(s1.class).to eql("normal")
+        expect(s1.keys).to eql(5)
+
+        expect{ s1.dup }.to raise_error(NoMethodError)
+      end
+    end
+
+    describe '#to_h' do
+      it 'returns internal hash itself' do
+        hash = {
+          name: 'tagomoris',
+          age: 34,
+          send: 'email',
+          class: 'normal',
+          keys: 5,
+        }
+        s = Fluent::Config::Section.new(hash)
+        expect(s.to_h).to eq(hash)
+        expect(s.to_h.class).to eq(Hash)
+      end
+    end
+
+    describe '#instance_of?' do
+      it 'can judge whether it is a Section object or not' do
+        s = Fluent::Config::Section.new
+        expect(s.instance_of?(Fluent::Config::Section)).to be true
+        expect(s.instance_of?(BasicObject)).to be false
+      end
+    end
+
+    describe '#is_a?' do
+      it 'can judge whether it belongs to or not' do
+        s = Fluent::Config::Section.new
+        expect(s.is_a?(Fluent::Config::Section)).to be true
+        expect(s.kind_of?(Fluent::Config::Section)).to be true
+        expect(s.is_a?(BasicObject)).to be true
+      end
+    end
+
+    describe '#+' do
+      it 'can merge 2 sections: argument side is primary, internal hash is newly created' do
+        h1 = {name: "s1", num: 10, class: "A"}
+        s1 = Fluent::Config::Section.new(h1)
+
+        h2 = {name: "s2", class: "A", num2: "5", num3: "8"}
+        s2 = Fluent::Config::Section.new(h2)
+        s = s1 + s2
+
+        expect(s.to_h.object_id).not_to eq(h1.object_id)
+        expect(s.to_h.object_id).not_to eq(h2.object_id)
+
+        expect(s.name).to eql("s2")
+        expect(s.num).to eql(10)
+        expect(s.class).to eql("A")
+        expect(s.num2).to eql("5")
+        expect(s.num3).to eql("8")
+      end
+    end
+  end
+end

data/spec/config/system_config_spec.rb

@@ -0,0 +1,49 @@
+require 'fluent/configurable'
+require 'fluent/config/element'
+require 'fluent/config/section'
+require 'fluent/supervisor'
+
+describe Fluent::Supervisor::SystemConfig do
+  def parse_text(text)
+    basepath = File.expand_path(File.dirname(__FILE__) + '/../../')
+    Fluent::Config.parse(text, '(test)', basepath, true).elements.find { |e| e.name == 'system' }
+  end
+
+  it 'should not override default configurations when no parameters' do
+    conf = parse_text(<<EOS)
+<system>
+</system>
+EOS
+    sc = Fluent::Supervisor::SystemConfig.new(conf)
+    expect(sc.log_level).to be_nil
+    expect(sc.suppress_repeated_stacktrace).to be_nil
+    expect(sc.emit_error_log_interval).to be_nil
+    expect(sc.suppress_config_dump).to be_nil
+    expect(sc.without_source).to be_nil
+    expect(sc.to_opt).to eql({})
+  end
+
+  {'log_level' => 'error', 'suppress_repeated_stacktrace' => true, 'emit_error_log_interval' => 60, 'suppress_config_dump' => true, 'without_source' => true}.each { |k, v|
+    it "accepts #{k} parameter" do
+      conf = parse_text(<<EOS)
+<system>
+  #{k} #{v}
+</system>
+EOS
+      sc = Fluent::Supervisor::SystemConfig.new(conf)
+      expect(sc.instance_variable_get("@#{k}")).not_to be_nil
+      if k == 'emit_error_log_interval'
+        expect(sc.to_opt).to include(:suppress_interval)
+      else
+        expect(sc.to_opt).to include(k.to_sym)
+      end
+    end
+  }
+
+  {'foo' => 'bar', 'hoge' => 'fuga'}.each { |k, v|
+    it "should not affect settable parameters with unknown #{k} parameter" do
+      sc = Fluent::Supervisor::SystemConfig.new({k => v})
+      expect(sc.to_opt).to be_empty
+    end
+  }
+end

data/test/helper.rb

@@ -1,28 +1,3 @@
-# simplecov must be loaded before any of target code
-if ENV['SIMPLE_COV']
-  require 'simplecov'
-  if defined?(SimpleCov::SourceFile)
-    mod = SimpleCov::SourceFile
-    def mod.new(*args, &block)
-      m = allocate
-      m.instance_eval do
-        begin
-          initialize(*args, &block)
-        rescue Encoding::UndefinedConversionError
-          @src = "".force_encoding('UTF-8')
-        end
-      end
-      m
-    end
-  end
-  unless SimpleCov.running
-    SimpleCov.start do
-      add_filter '/test/'
-      add_filter '/gems/'
-    end
-  end
-end
-
 require 'test/unit'
 require 'fileutils'
 require 'fluent/log'

data/test/plugin/test_in_exec.rb

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

data/test/plugin/test_in_forward.rb

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

data/test/plugin/test_in_gc_stat.rb

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

data/test/plugin/test_in_http.rb

@@ -1,4 +1,5 @@
-require_relative '../helper'
+require 'fluent/test'
+require 'helper'
 require 'net/http'
 
 class HttpInputTest < Test::Unit::TestCase
@@ -12,7 +13,6 @@ 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)
@@ -157,7 +157,7 @@ class HttpInputTest < Test::Unit::TestCase
 
   def test_with_regexp
     d = create_driver(CONFIG + %[
-      format /^(?<field_1>\\d+):(?<field_2>\\w+)$/
+      format /^(?<field_1>\\\\d+):(?<field_2>\\\\w+)$/
       types field_1:integer
     ])
 
@@ -199,81 +199,6 @@ 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_relative '../helper'
+require 'fluent/test'
 
 class ObjectSpaceInputTest < Test::Unit::TestCase
   class FailObject

data/test/plugin/test_in_status.rb

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

data/test/plugin/test_in_stream.rb

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

data/test/plugin/test_in_syslog.rb

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

data/test/plugin/test_in_tail.rb

@@ -1,4 +1,4 @@
-require_relative '../helper'
+require 'fluent/test'
 require 'net/http'
 require 'flexmock'
 
@@ -388,11 +388,6 @@ class TailInputTest < Test::Unit::TestCase
       timeclass.should_receive(:now).with_no_args.and_return(Time.new(2010, 1, 2, 3, 4, 5))
       assert_equal EX_PATHS, plugin.expand_paths.sort
     end
-
-    # Test exclusion
-    exclude_config = EX_CONFIG + "  exclude_path [\"#{EX_PATHS.last}\"]"
-    plugin = create_driver(exclude_config, false).instance
-    assert_equal EX_PATHS - [EX_PATHS.last], plugin.expand_paths.sort
   end
 
   def test_refresh_watchers
@@ -445,7 +440,7 @@ class TailInputTest < Test::Unit::TestCase
 
   def test_receive_lines
     plugin = create_driver(EX_CONFIG, false).instance
-    flexstub(Fluent::Engine) do |engineclass|
+    flexstub(plugin.router) do |engineclass|
       engineclass.should_receive(:emit_stream).with('tail', any).once
       plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
     end
@@ -457,7 +452,7 @@ class TailInputTest < Test::Unit::TestCase
       read_from_head true
     ]
     plugin = create_driver(config, false).instance
-    flexstub(Fluent::Engine) do |engineclass|
+    flexstub(plugin.router) do |engineclass|
       engineclass.should_receive(:emit_stream).with('pre.foo.bar.log', any).once
       plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
     end
@@ -469,7 +464,7 @@ class TailInputTest < Test::Unit::TestCase
       read_from_head true
     ]
     plugin = create_driver(config, false).instance
-    flexstub(Fluent::Engine) do |engineclass|
+    flexstub(plugin.router) do |engineclass|
       engineclass.should_receive(:emit_stream).with('foo.bar.log.post', any).once
       plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
     end
@@ -481,7 +476,7 @@ class TailInputTest < Test::Unit::TestCase
       read_from_head true
     ]
     plugin = create_driver(config, false).instance
-    flexstub(Fluent::Engine) do |engineclass|
+    flexstub(plugin.router) do |engineclass|
       engineclass.should_receive(:emit_stream).with('pre.foo.bar.log.post', any).once
       plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
     end
@@ -493,7 +488,7 @@ class TailInputTest < Test::Unit::TestCase
       read_from_head true
     ]
     plugin = create_driver(config, false).instance
-    flexstub(Fluent::Engine) do |engineclass|
+    flexstub(plugin.router) do |engineclass|
       engineclass.should_receive(:emit_stream).with('pre.foo.bar.log.post', any).once
       plugin.receive_lines(['foo', 'bar'], DummyWatcher.new('foo.bar.log'))
     end

data/test/plugin/test_in_tcp.rb

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

data/test/plugin/test_in_udp.rb

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

data/test/plugin/test_out_copy.rb

@@ -1,17 +1,6 @@
-require_relative '../helper'
+require 'fluent/test'
 
 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_relative '../helper'
+require 'fluent/test'
 require 'fileutils'
 
 class ExecOutputTest < Test::Unit::TestCase

data/test/plugin/test_out_exec_filter.rb

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