fluentd 0.10.62 → 0.12.0.pre.1

data/test/plugin/test_out_file.rb

@@ -1,4 +1,3 @@
-require_relative '../helper'
 require 'fluent/test'
 require 'fileutils'
 require 'time'
@@ -64,41 +63,6 @@ class FileOutputTest < Test::Unit::TestCase
     d.run
   end
 
-  def test_timezone_1
-    d = create_driver %[
-      path #{TMP_DIR}/out_file_test
-      timezone Asia/Taipei
-    ]
-
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-
-    d.emit({"a"=>1}, time)
-    d.expect_format %[2011-01-02T21:14:15+08:00\ttest\t{"a":1}\n]
-    d.run
-  end
-
-  def test_timezone_2
-    d = create_driver %[
-      path #{TMP_DIR}/out_file_test
-      timezone -03:30
-    ]
-
-    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-
-    d.emit({"a"=>1}, time)
-    d.expect_format %[2011-01-02T09:44:15-03:30\ttest\t{"a":1}\n]
-    d.run
-  end
-
-  def test_timezone_invalid
-    assert_raise(Fluent::ConfigError) do
-      create_driver %[
-        path #{TMP_DIR}/out_file_test
-        timezone Invalid/Invalid
-      ]
-    end
-  end
-
   def check_gzipped_result(path, expect)
     # Zlib::GzipReader has a bug of concatenated file: https://bugs.ruby-lang.org/issues/9790
     # Following code from https://www.ruby-forum.com/topic/971591#979520
@@ -126,7 +90,7 @@ class FileOutputTest < Test::Unit::TestCase
 
     # FileOutput#write returns path
     path = d.run
-    expect_path = "#{TMP_DIR}/out_file_test.20110102_0.log.gz"
+    expect_path = "#{TMP_DIR}/out_file_test._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])
@@ -178,13 +142,13 @@ class FileOutputTest < Test::Unit::TestCase
 
     # FileOutput#write returns path
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test.20110102_0.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test._0.log.gz", path
     check_gzipped_result(path, formatted_lines)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test.20110102_1.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test._1.log.gz", path
     check_gzipped_result(path, formatted_lines)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test.20110102_2.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test._2.log.gz", path
     check_gzipped_result(path, formatted_lines)
   end
 
@@ -203,13 +167,13 @@ class FileOutputTest < Test::Unit::TestCase
 
     # FileOutput#write returns path
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test.20110102.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test..log.gz", path
     check_gzipped_result(path, formatted_lines)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test.20110102.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test..log.gz", path
     check_gzipped_result(path, formatted_lines * 2)
     path = d.run
-    assert_equal "#{TMP_DIR}/out_file_test.20110102.log.gz", path
+    assert_equal "#{TMP_DIR}/out_file_test..log.gz", path
     check_gzipped_result(path, formatted_lines * 3)
   end
 
@@ -241,58 +205,5 @@ 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
 

data/test/plugin/test_out_forward.rb

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

data/test/plugin/test_out_roundrobin.rb

@@ -1,17 +1,6 @@
-require_relative '../helper'
+require 'fluent/test'
 
 class RoundRobinOutputTest < 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_stdout.rb

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

data/test/plugin/test_out_stream.rb

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

data/test/scripts/fluent/plugin/formatter_known.rb

@@ -1,8 +1,5 @@
 module Fluent
-  TextFormatter.register_template('known_old', Proc.new { |tag, time, record|
-      "#{tag}:#{time}:#{record.size}"
-    })
-  Plugin.register_formatter('known', Proc.new { |tag, time, record|
+  TextFormatter.register_template('known', Proc.new { |tag, time, record|
       "#{tag}:#{time}:#{record.size}"
     })
 end

data/test/scripts/fluent/plugin/parser_known.rb

@@ -1,4 +1,3 @@
 module Fluent
-  TextParser.register_template('known_old', /^(?<message>.*)$/)
-  Plugin.register_parser('known', /^(?<message>.*)$/)
+  TextParser.register_template('known', /^(?<message>.*)$/)
 end

data/test/test_config.rb

@@ -1,4 +1,4 @@
-require_relative 'helper'
+require File.dirname(__FILE__) + '/helper'
 require 'fluent/config'
 require 'fluent/config/parser'
 require 'fluent/supervisor'

data/test/test_configdsl.rb

@@ -1,5 +1,6 @@
-require_relative 'helper'
 require 'fluent/config/dsl'
+require 'fluent/test'
+require 'helper'
 
 class ConfigDSLTest < Test::Unit::TestCase
   # TEST_CONFIG1 = %[

data/test/test_formatter.rb

@@ -1,4 +1,4 @@
-require_relative 'helper'
+require 'helper'
 require 'fluent/test'
 require 'fluent/formatter'
 
@@ -29,25 +29,6 @@ module FormatterTest
     {'message' => 'awesome'}
   end
 
-  def with_timezone(tz)
-    oldtz, ENV['TZ'] = ENV['TZ'], tz
-    yield
-  ensure
-    ENV['TZ'] = oldtz
-  end
-
-  class BaseFormatterTest < ::Test::Unit::TestCase
-    include FormatterTest
-
-    def test_call
-      formatter = Formatter.new
-      formatter.configure({})
-      assert_raise NotImplementedError do
-        formatter.format('tag', Engine.now, {})
-      end
-    end
-  end
-
   class OutFileFormatterTest < ::Test::Unit::TestCase
     include FormatterTest
 
@@ -132,49 +113,6 @@ module FormatterTest
     end
   end
 
-  class MessagePackFormatterTest < ::Test::Unit::TestCase
-    include FormatterTest
-
-    def setup
-      @formatter = TextFormatter::MessagePackFormatter.new
-      @time = Engine.now
-    end
-
-    def test_format
-      @formatter.configure({})
-      formatted = @formatter.format(tag, @time, record)
-
-      assert_equal(record.to_msgpack, formatted)
-    end
-
-    def test_format_with_include_tag
-      @formatter.configure('include_tag_key' => 'true', 'tag_key' => 'foo')
-      formatted = @formatter.format(tag, @time, record.dup)
-
-      r = record
-      r['foo'] = tag
-      assert_equal(r.to_msgpack, formatted)
-    end
-
-    def test_format_with_include_time
-      @formatter.configure('include_time_key' => 'true', 'localtime' => '')
-      formatted = @formatter.format(tag, @time, record.dup)
-
-      r = record
-      r['time'] = time2str(@time, true)
-      assert_equal(r.to_msgpack, formatted)
-    end
-
-    def test_format_with_include_time_as_number
-      @formatter.configure('include_time_key' => 'true', 'time_as_epoch' => 'true', 'time_key' => 'epoch')
-      formatted = @formatter.format(tag, @time, record.dup)
-
-      r = record
-      r['epoch'] = @time
-      assert_equal(r.to_msgpack, formatted)
-    end
-  end
-
   class LabeledTSVFormatterTest < ::Test::Unit::TestCase
     include FormatterTest
 
@@ -229,118 +167,6 @@ module FormatterTest
     end
   end
 
-  class CsvFormatterTest < ::Test::Unit::TestCase
-    include FormatterTest
-
-    def setup
-      @formatter = TextFormatter::CsvFormatter.new
-      @time = Engine.now
-    end
-    
-    def test_config_params
-      assert_equal ',', @formatter.delimiter
-      assert_equal true, @formatter.force_quotes
-      assert_equal [], @formatter.fields
-    end
-
-    data(
-      'tab_char' => ["\t", '\t'],
-      'tab_string' => ["\t", 'TAB'],
-      'pipe' => ['|', '|'])
-    def test_config_params_with_customized_delimiters(data)
-      expected, target = data
-      @formatter.configure('delimiter' => target)
-      assert_equal expected, @formatter.delimiter
-    end
-
-    def test_format
-      @formatter.configure('fields' => 'message,message2')
-      formatted = @formatter.format(tag, @time, {
-        'message' => 'awesome',
-        'message2' => 'awesome2'
-      })
-      assert_equal("\"awesome\",\"awesome2\"\n", formatted)
-    end
-
-    def test_format_with_tag
-      @formatter.configure(
-        'fields' => 'tag,message,message2',
-        'include_tag_key' => 'true'
-      )
-      formatted = @formatter.format(tag, @time, {
-        'message' => 'awesome',
-        'message2' => 'awesome2'
-      })
-      assert_equal("\"tag\",\"awesome\",\"awesome2\"\n", formatted)
-    end
-
-    def test_format_with_time
-      @formatter.configure(
-        'fields' => 'time,message,message2',
-        'include_time_key' => 'true',
-        'time_format' => '%Y'
-      )
-      formatted = @formatter.format(tag, @time, {
-        'message' => 'awesome',
-        'message2' => 'awesome2'
-      })
-      assert_equal("\"#{Time.now.year}\",\"awesome\",\"awesome2\"\n",
-                   formatted)
-    end
-
-    def test_format_with_customized_delimiters
-      @formatter.configure(
-        'fields' => 'message,message2',
-        'delimiter' => '\t'
-      )
-      formatted = @formatter.format(tag, @time, {
-        'message' => 'awesome',
-        'message2' => 'awesome2'
-      })
-      assert_equal("\"awesome\"\t\"awesome2\"\n", formatted)
-    end
-
-    def test_format_with_non_quote
-      @formatter.configure(
-        'fields' => 'message,message2',
-        'force_quotes' => 'false'
-      )
-      formatted = @formatter.format(tag, @time, {
-        'message' => 'awesome',
-        'message2' => 'awesome2'
-      })
-      assert_equal("awesome,awesome2\n", formatted)
-    end
-
-    data(
-      'nil' => {
-        'message' => 'awesome',
-        'message2' => nil,
-        'message3' => 'awesome3'
-      },
-      'blank' => {
-        'message' => 'awesome',
-        'message2' => '',
-        'message3' => 'awesome3'
-      })
-    def test_format_with_empty_fields(data)
-      @formatter.configure(
-        'fields' => 'message,message2,message3'
-      )
-      formatted = @formatter.format(tag, @time, data)
-      assert_equal("\"awesome\",\"\",\"awesome3\"\n", formatted)
-    end
-
-    data(
-      'normally' => 'one,two,three',
-      'white_space' => 'one , two , three',
-      'blank' => 'one,,two,three')
-    def test_config_params_with_fields(data)
-      @formatter.configure('fields' => data)
-      assert_equal %w(one two three), @formatter.fields
-    end
-  end
-
   class SingleValueFormatterTest < ::Test::Unit::TestCase
     include FormatterTest
 
@@ -383,228 +209,10 @@ module FormatterTest
       end
     end
 
-    data('register_formatter' => 'known', 'register_template' => 'known_old')
-    def test_find_formatter(data)
+    def test_find_formatter
       $LOAD_PATH.unshift(File.join(File.expand_path(File.dirname(__FILE__)), 'scripts'))
       assert_nothing_raised ConfigError do
-        TextFormatter::TEMPLATE_REGISTRY.lookup(data)
-      end
-      $LOAD_PATH.shift
-    end
-  end
-
-  class TimeFormatterTest < ::Test::Unit::TestCase
-    include FormatterTest
-
-    def setup
-      @time = Time.new(2014, 9, 27, 0, 0, 0, 0).to_i
-      @fmt  = "%Y%m%d %H%M%z"  # YYYYMMDD HHMM[+-]HHMM
-    end
-
-    def format(format, localtime, timezone)
-      formatter = Fluent::TimeFormatter.new(format, localtime, timezone)
-      formatter.format(@time)
-    end
-
-    def test_default_utc_nil
-      assert_equal("2014-09-27T00:00:00Z", format(nil, false, nil))
-    end
-
-    def test_default_utc_pHH_MM
-      assert_equal("2014-09-27T01:30:00+01:30", format(nil, false, "+01:30"))
-    end
-
-    def test_default_utc_nHH_MM
-      assert_equal("2014-09-26T22:30:00-01:30", format(nil, false, "-01:30"))
-    end
-
-    def test_default_utc_pHHMM
-      assert_equal("2014-09-27T02:30:00+02:30", format(nil, false, "+0230"))
-    end
-
-    def test_default_utc_nHHMM
-      assert_equal("2014-09-26T21:30:00-02:30", format(nil, false, "-0230"))
-    end
-
-    def test_default_utc_pHH
-      assert_equal("2014-09-27T03:00:00+03:00", format(nil, false, "+03"))
-    end
-
-    def test_default_utc_nHH
-      assert_equal("2014-09-26T21:00:00-03:00", format(nil, false, "-03"))
-    end
-
-    def test_default_utc_timezone_1
-      # Asia/Tokyo (+09:00) does not have daylight saving time.
-      assert_equal("2014-09-27T09:00:00+09:00", format(nil, false, "Asia/Tokyo"))
-    end
-
-    def test_default_utc_timezone_2
-      # Pacific/Honolulu (-10:00) does not have daylight saving time.
-      assert_equal("2014-09-26T14:00:00-10:00", format(nil, false, "Pacific/Honolulu"))
-    end
-
-    def test_default_utc_timezone_3
-      # America/Argentina/Buenos_Aires (-03:00) does not have daylight saving time.
-      assert_equal("2014-09-26T21:00:00-03:00", format(nil, false, "America/Argentina/Buenos_Aires"))
-    end
-
-    def test_default_utc_timezone_4
-      # Europe/Paris has daylight saving time. Its UTC offset is +01:00 and its
-      # UTC offset in DST is +02:00. In September, Europe/Paris is in DST.
-      assert_equal("2014-09-27T02:00:00+02:00", format(nil, false, "Europe/Paris"))
-    end
-
-    def test_default_utc_timezone_5
-      # Europe/Paris has daylight saving time. Its UTC offset is +01:00 and its
-      # UTC offset in DST is +02:00. In January, Europe/Paris is not in DST.
-      @time = Time.new(2014, 1, 24, 0, 0, 0, 0).to_i
-      assert_equal("2014-01-24T01:00:00+01:00", format(nil, false, "Europe/Paris"))
-    end
-
-    def test_default_utc_invalid
-      assert_equal("2014-09-27T00:00:00Z", format(nil, false, "Invalid"))
-    end
-
-    def test_default_localtime_nil_1
-      with_timezone("UTC-04") do
-        assert_equal("2014-09-27T04:00:00+04:00", format(nil, true, nil))
-      end
-    end
-
-    def test_default_localtime_nil_2
-      with_timezone("UTC+05") do
-        assert_equal("2014-09-26T19:00:00-05:00", format(nil, true, nil))
-      end
-    end
-
-    def test_default_localtime_timezone
-      # 'timezone' takes precedence over 'localtime'.
-      with_timezone("UTC-06") do
-        assert_equal("2014-09-27T07:00:00+07:00", format(nil, true, "+07"))
-      end
-    end
-
-    def test_specific_utc_nil
-      assert_equal("20140927 0000+0000", format(@fmt, false, nil))
-    end
-
-    def test_specific_utc_pHH_MM
-      assert_equal("20140927 0830+0830", format(@fmt, false, "+08:30"))
-    end
-
-    def test_specific_utc_nHH_MM
-      assert_equal("20140926 1430-0930", format(@fmt, false, "-09:30"))
-    end
-
-    def test_specific_utc_pHHMM
-      assert_equal("20140927 1030+1030", format(@fmt, false, "+1030"))
-    end
-
-    def test_specific_utc_nHHMM
-      assert_equal("20140926 1230-1130", format(@fmt, false, "-1130"))
-    end
-
-    def test_specific_utc_pHH
-      assert_equal("20140927 1200+1200", format(@fmt, false, "+12"))
-    end
-
-    def test_specific_utc_nHH
-      assert_equal("20140926 1100-1300", format(@fmt, false, "-13"))
-    end
-
-    def test_specific_utc_timezone_1
-      # Europe/Moscow (+04:00) does not have daylight saving time.
-      assert_equal("20140927 0400+0400", format(@fmt, false, "Europe/Moscow"))
-    end
-
-    def test_specific_utc_timezone_2
-      # Pacific/Galapagos (-06:00) does not have daylight saving time.
-      assert_equal("20140926 1800-0600", format(@fmt, false, "Pacific/Galapagos"))
-    end
-
-    def test_specific_utc_timezone_3
-      # America/Argentina/Buenos_Aires (-03:00) does not have daylight saving time.
-      assert_equal("20140926 2100-0300", format(@fmt, false, "America/Argentina/Buenos_Aires"))
-    end
-
-    def test_specific_utc_timezone_4
-      # America/Los_Angeles has daylight saving time. Its UTC offset is -08:00 and its
-      # UTC offset in DST is -07:00. In September, America/Los_Angeles is in DST.
-      assert_equal("20140926 1700-0700", format(@fmt, false, "America/Los_Angeles"))
-    end
-
-    def test_specific_utc_timezone_5
-      # America/Los_Angeles has daylight saving time. Its UTC offset is -08:00 and its
-      # UTC offset in DST is -07:00. In January, America/Los_Angeles is not in DST.
-      @time = Time.new(2014, 1, 24, 0, 0, 0, 0).to_i
-      assert_equal("20140123 1600-0800", format(@fmt, false, "America/Los_Angeles"))
-    end
-
-    def test_specific_utc_invalid
-      assert_equal("20140927 0000+0000", format(@fmt, false, "Invalid"))
-    end
-
-    def test_specific_localtime_nil_1
-      with_timezone("UTC-07") do
-        assert_equal("20140927 0700+0700", format(@fmt, true, nil))
-      end
-    end
-
-    def test_specific_localtime_nil_2
-      with_timezone("UTC+08") do
-        assert_equal("20140926 1600-0800", format(@fmt, true, nil))
-      end
-    end
-
-    def test_specific_localtime_timezone
-      # 'timezone' takes precedence over 'localtime'.
-      with_timezone("UTC-09") do
-        assert_equal("20140926 1400-1000", format(@fmt, true, "-10"))
-      end
-    end
-  end
-
-  class TimeConfigTest < ::Test::Unit::TestCase
-    include FormatterTest
-
-    def setup
-      @formatter = TextFormatter::LabeledTSVFormatter.new
-      @time      = Time.new(2014, 9, 27, 0, 0, 0, 0).to_i
-    end
-
-    def format(conf)
-      @formatter.configure({'include_time_key' => true}.merge(conf))
-      formatted = @formatter.format("tag", @time, {})
-      # Drop the leading "time:" and the trailing "\n".
-      formatted[5..-2]
-    end
-
-    def test_none
-      with_timezone("UTC-01") do
-        # 'localtime' is true by default.
-        assert_equal("2014-09-27T01:00:00+01:00", format({}))
-      end
-    end
-
-    def test_utc
-      with_timezone("UTC-01") do
-        # 'utc' takes precedence over 'localtime'.
-        assert_equal("2014-09-27T00:00:00Z", format("utc" => true))
-      end
-    end
-
-    def test_timezone
-      with_timezone("UTC-01") do
-        # 'timezone' takes precedence over 'localtime'.
-        assert_equal("2014-09-27T02:00:00+02:00", format("timezone" => "+02"))
-      end
-    end
-
-    def test_utc_timezone
-      with_timezone("UTC-01") do
-        # 'timezone' takes precedence over 'utc'.
-        assert_equal("2014-09-27T09:00:00+09:00", format("utc" => true, "timezone" => "Asia/Tokyo"))
+        TextFormatter::TEMPLATE_REGISTRY.lookup('known')
       end
     end
   end