fluent-plugin-elasticsearch 1.18.2 → 2.0.0.rc.1

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -1,10 +1,8 @@
 require 'helper'
 require 'date'
-require 'flexmock/test_unit'
+require 'fluent/test/driver/output'
 
 class ElasticsearchOutputDynamic < Test::Unit::TestCase
-  include FlexMock::TestCase
-
   attr_accessor :index_cmds, :index_command_counts
 
   def setup
@@ -13,8 +11,8 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     @driver = nil
   end
 
-  def driver(tag='test', conf='')
-    @driver ||= Fluent::Test::BufferedOutputTestDriver.new(Fluent::ElasticsearchOutputDynamic, tag) {
+  def driver(conf='')
+    @driver ||= Fluent::Test::Driver::Output.new(Fluent::Plugin::ElasticsearchOutputDynamic) {
       # v0.12's test driver assume format definition. This simulates ObjectBufferedOutput format
       if !defined?(Fluent::Plugin::Output)
         def format(tag, time, record)
@@ -63,20 +61,14 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
       user     john
       password doe
     }
-    instance = driver('test', config).instance
+    instance = driver(config).instance
 
     conf = instance.dynamic_config
     assert_equal 'logs.google.com', conf['host']
     assert_equal "777", conf['port']
-    assert_equal :https, instance.scheme
     assert_equal 'john', instance.user
     assert_equal 'doe', instance.password
     assert_equal '/es/', instance.path
-    assert_equal :TLSv1, instance.ssl_version
-    assert_nil instance.client_key
-    assert_nil instance.client_cert
-    assert_nil instance.client_key_pass
-    assert_false instance.with_transporter_log
   end
 
   def test_defaults
@@ -87,7 +79,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
       user     john
       password doe
     }
-    instance = driver('test', config).instance
+    instance = driver(config).instance
 
     conf = instance.dynamic_config
     assert_equal "9200", conf['port']
@@ -103,7 +95,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
       path     /es/
       port     123
     }
-    instance = driver('test', config).instance
+    instance = driver(config).instance
 
     assert_equal 3, instance.get_connection_options(nil)[:hosts].length
     host1, host2, host3 = instance.get_connection_options(nil)[:hosts]
@@ -125,7 +117,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
       user     default_user
       password default_password
     }
-    instance = driver('test', config).instance
+    instance = driver(config).instance
 
     assert_equal 2, instance.get_connection_options(nil)[:hosts].length
     host1, host2 = instance.get_connection_options(nil)[:hosts]
@@ -144,39 +136,13 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert_equal '/default_path', host2[:path]
   end
 
-  def test_hosts_list_with_escape_placeholders
-    config = %{
-      hosts    https://%{j+hn}:%{passw@rd}@host1:443/elastic/,http://host2
-      path     /default_path
-      user     default_user
-      password default_password
-    }
-    instance = driver('test', config).instance
-
-    assert_equal 2, instance.get_connection_options(nil)[:hosts].length
-    host1, host2 = instance.get_connection_options(nil)[:hosts]
-
-    assert_equal 'host1', host1[:host]
-    assert_equal 443, host1[:port]
-    assert_equal 'https', host1[:scheme]
-    assert_equal 'j%2Bhn', host1[:user]
-    assert_equal 'passw%40rd', host1[:password]
-    assert_equal '/elastic/', host1[:path]
-
-    assert_equal 'host2', host2[:host]
-    assert_equal 'http', host2[:scheme]
-    assert_equal 'default_user', host2[:user]
-    assert_equal 'default_password', host2[:password]
-    assert_equal '/default_path', host2[:path]
-  end
-
   def test_single_host_params_and_defaults
     config = %{
       host     logs.google.com
       user     john
       password doe
     }
-    instance = driver('test', config).instance
+    instance = driver(config).instance
 
     assert_equal 1, instance.get_connection_options(nil)[:hosts].length
     host1 = instance.get_connection_options(nil)[:hosts][0]
@@ -189,98 +155,82 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert_equal nil, host1[:path]
   end
 
-  def test_single_host_params_and_defaults_with_escape_placeholders
-    config = %{
-      host     logs.google.com
-      user     %{j+hn}
-      password %{d@e}
-    }
-    instance = driver('test', config).instance
-
-    assert_equal 1, instance.get_connection_options(nil)[:hosts].length
-    host1 = instance.get_connection_options(nil)[:hosts][0]
-
-    assert_equal 'logs.google.com', host1[:host]
-    assert_equal 9200, host1[:port]
-    assert_equal 'http', host1[:scheme]
-    assert_equal 'j%2Bhn', host1[:user]
-    assert_equal 'd%40e', host1[:password]
-    assert_equal nil, host1[:path]
-  end
-
   def test_content_type_header
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
-    if Elasticsearch::VERSION >= "6.0.2"
-      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-                          with(headers: { "Content-Type" => "application/x-ndjson" })
-    else
-      elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-                          with(headers: { "Content-Type" => "application/json" })
-    end
-    driver.emit(sample_record)
-    driver.run
+    elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
+      with(headers: { "Content-Type" => "application/json" })
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_requested(elastic_request)
   end
 
   def test_writes_to_default_index
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal('fluentd', index_cmds.first['index']['_index'])
   end
 
   def test_writes_to_default_type
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal('fluentd', index_cmds.first['index']['_type'])
   end
 
-  def test_writes_to_specified_index
+  def test_writes_to_speficied_index
     driver.configure("index_name myindex\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal('myindex', index_cmds.first['index']['_index'])
   end
 
-  def test_writes_to_specified_index_uppercase
+  def test_writes_to_speficied_index_uppercase
     driver.configure("index_name MyIndex\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal('myindex', index_cmds.first['index']['_index'])
   end
 
-  def test_writes_to_specified_type
+  def test_writes_to_speficied_type
     driver.configure("type_name mytype\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal('mytype', index_cmds.first['index']['_type'])
   end
 
-  def test_writes_to_specified_host
+  def test_writes_to_speficied_host
     driver.configure("host 192.168.33.50\n")
     stub_elastic_ping("http://192.168.33.50:9200")
     elastic_request = stub_elastic("http://192.168.33.50:9200/_bulk")
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_requested(elastic_request)
   end
 
-  def test_writes_to_specified_port
+  def test_writes_to_speficied_port
     driver.configure("port 9201\n")
     stub_elastic_ping("http://localhost:9201")
     elastic_request = stub_elastic("http://localhost:9201/_bulk")
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_requested(elastic_request)
   end
 
@@ -296,12 +246,11 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
       stub_elastic_with_store_index_command_counts("http://#{host}:#{port}/_bulk")
     end
 
-    1000.times do
-      driver.emit(sample_record.merge('age'=>rand(100)))
+    driver.run(default_tag: 'test') do
+      1000.times do
+        driver.feed(sample_record.merge('age'=>rand(100)))
+      end
     end
-
-    driver.run
-
     # @note: we cannot make multi chunks with options (flush_interval, buffer_chunk_limit)
     # it's Fluentd test driver's constraint
     # so @index_command_counts.size is always 1
@@ -318,78 +267,85 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
   def test_makes_bulk_request
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.emit(sample_record.merge('age' => 27))
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+      driver.feed(sample_record.merge('age' => 27))
+    end
     assert_equal(4, index_cmds.count)
   end
 
   def test_all_records_are_preserved_in_bulk
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.emit(sample_record.merge('age' => 27))
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+      driver.feed(sample_record.merge('age' => 27))
+    end
     assert_equal(26, index_cmds[1]['age'])
     assert_equal(27, index_cmds[3]['age'])
   end
 
   def test_writes_to_logstash_index
     driver.configure("logstash_format true\n")
-    time = Time.parse Date.today.iso8601
+    time = Time.parse Date.today.to_s
     logstash_index = "logstash-#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record, time.to_i)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
   def test_writes_to_logstash_utc_index
     driver.configure("logstash_format true
                       utc_index false")
-    time = Time.parse Date.today.iso8601
+    time = Time.parse Date.today.to_s
     utc_index = "logstash-#{time.strftime("%Y.%m.%d")}"
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record, time.to_i)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
     assert_equal(utc_index, index_cmds.first['index']['_index'])
   end
 
   def test_writes_to_logstash_index_with_specified_prefix
     driver.configure("logstash_format true
                       logstash_prefix myprefix")
-    time = Time.parse Date.today.iso8601
+    time = Time.parse Date.today.to_s
     logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record, time.to_i)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
   def test_writes_to_logstash_index_with_specified_prefix_uppercase
     driver.configure("logstash_format true
                       logstash_prefix MyPrefix")
-    time = Time.parse Date.today.iso8601
+    time = Time.parse Date.today.to_s
     logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m.%d")}"
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record, time.to_i)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
     def test_writes_to_logstash_index_with_specified_dateformat
     driver.configure("logstash_format true
                       logstash_dateformat %Y.%m")
-    time = Time.parse Date.today.iso8601
+    time = Time.parse Date.today.to_s
     logstash_index = "logstash-#{time.getutc.strftime("%Y.%m")}"
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record, time.to_i)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
@@ -397,20 +353,22 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("logstash_format true
                       logstash_prefix myprefix
                       logstash_dateformat %Y.%m")
-    time = Time.parse Date.today.iso8601
+    time = Time.parse Date.today.to_s
     logstash_index = "myprefix-#{time.getutc.strftime("%Y.%m")}"
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record, time.to_i)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
   def test_doesnt_add_logstash_timestamp_by_default
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_nil(index_cmds[1]['@timestamp'])
   end
 
@@ -418,111 +376,69 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("logstash_format true\n")
     stub_elastic_ping
     stub_elastic
-    ts = DateTime.now.iso8601
-    driver.emit(sample_record)
-    driver.run
+    ts = DateTime.now
+    time = Fluent::EventTime.from_time(ts.to_time)
+    driver.run(default_tag: 'test') do
+      driver.feed(time, sample_record)
+    end
     assert(index_cmds[1].has_key? '@timestamp')
-    assert_equal(index_cmds[1]['@timestamp'], ts)
+    assert_equal(index_cmds[1]['@timestamp'], ts.to_s)
   end
 
   def test_uses_custom_timestamp_when_included_in_record
-    driver.configure("include_timestamp true\n")
-    stub_elastic_ping
-    stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('@timestamp' => ts))
-    driver.run
-    assert(index_cmds[1].has_key? '@timestamp')
-    assert_equal(index_cmds[1]['@timestamp'], ts)
-  end
-
-  def test_uses_custom_timestamp_when_included_in_record_logstash
     driver.configure("logstash_format true\n")
     stub_elastic_ping
     stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('@timestamp' => ts))
-    driver.run
+    ts = DateTime.new(2001,2,3).to_s
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record.merge!('@timestamp' => ts))
+    end
     assert(index_cmds[1].has_key? '@timestamp')
     assert_equal(index_cmds[1]['@timestamp'], ts)
   end
 
-  def test_uses_custom_time_key_logstash
+  def test_uses_custom_time_key
     driver.configure("logstash_format true
                       time_key vtm\n")
     stub_elastic_ping
     stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('vtm' => ts))
-    driver.run
-    assert(index_cmds[1].has_key? '@timestamp')
-    assert_equal(index_cmds[1]['@timestamp'], ts)
-  end
-
-  def test_uses_custom_time_key_timestamp
-    driver.configure("include_timestamp true
-                      time_key vtm\n")
-    stub_elastic_ping
-    stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('vtm' => ts))
-    driver.run
-    assert(index_cmds[1].has_key? '@timestamp')
-    assert_equal(index_cmds[1]['@timestamp'], ts)
-  end
-
-  def test_uses_custom_time_key_timestamp_custom_index
-    driver.configure("include_timestamp true
-                      index_name test
-                      time_key vtm\n")
-    stub_elastic_ping
-    stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('vtm' => ts))
-    driver.run
+    ts = DateTime.new(2001,2,3).to_s
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record.merge!('vtm' => ts))
+    end
     assert(index_cmds[1].has_key? '@timestamp')
     assert_equal(index_cmds[1]['@timestamp'], ts)
-    assert_equal('test', index_cmds.first['index']['_index'])
   end
 
   def test_uses_custom_time_key_exclude_timestamp
-    driver.configure("include_timestamp true
-                      time_key vtm
-                      time_key_exclude_timestamp true\n")
-    stub_elastic_ping
-    stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('vtm' => ts))
-    driver.run
-    assert(!index_cmds[1].key?('@timestamp'), '@timestamp should be missing')
-  end
-
-  def test_uses_custom_time_key_exclude_timestamp_logstash
     driver.configure("logstash_format true
                       time_key vtm
                       time_key_exclude_timestamp true\n")
     stub_elastic_ping
     stub_elastic
-    ts = DateTime.new(2001,2,3).iso8601
-    driver.emit(sample_record.merge!('vtm' => ts))
-    driver.run
+    ts = DateTime.new(2001,2,3).to_s
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record.merge!('vtm' => ts))
+    end
     assert(!index_cmds[1].key?('@timestamp'), '@timestamp should be missing')
   end
 
   def test_doesnt_add_tag_key_by_default
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_nil(index_cmds[1]['tag'])
   end
 
   def test_adds_tag_key_when_configured
-    driver('mytag').configure("include_tag_key true\n")
+    driver.configure("include_tag_key true\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'mytag') do
+      driver.feed(sample_record)
+    end
     assert(index_cmds[1].has_key?('tag'))
     assert_equal(index_cmds[1]['tag'], 'mytag')
   end
@@ -531,8 +447,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("id_key request_id\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal(index_cmds[0]['index']['_id'], '42')
   end
 
@@ -540,16 +457,18 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("id_key another_request_id\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(!index_cmds[0]['index'].has_key?('_id'))
   end
 
   def test_adds_id_key_when_not_configured
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(!index_cmds[0]['index'].has_key?('_id'))
   end
 
@@ -557,8 +476,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("parent_key parent_id\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal(index_cmds[0]['index']['_parent'], 'parent')
   end
 
@@ -566,16 +486,18 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("parent_key another_parent_id\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(!index_cmds[0]['index'].has_key?('_parent'))
   end
 
   def test_adds_parent_key_when_not_configured
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(!index_cmds[0]['index'].has_key?('_parent'))
   end
 
@@ -583,8 +505,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("routing_key routing_id\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal(index_cmds[0]['index']['_routing'], 'routing')
   end
 
@@ -592,16 +515,18 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("routing_key another_routing_id\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(!index_cmds[0]['index'].has_key?('_routing'))
   end
 
   def test_adds_routing_key_when_not_configured
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(!index_cmds[0]['index'].has_key?('_routing'))
   end
 
@@ -609,8 +534,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("remove_keys key1\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record.merge('key1' => 'v1', 'key2' => 'v2'))
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record.merge('key1' => 'v1', 'key2' => 'v2'))
+    end
     assert(!index_cmds[1].has_key?('key1'))
     assert(index_cmds[1].has_key?('key2'))
   end
@@ -619,8 +545,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("remove_keys key1, key2\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record.merge('key1' => 'v1', 'key2' => 'v2'))
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record.merge('key1' => 'v1', 'key2' => 'v2'))
+    end
     assert(!index_cmds[1].has_key?('key1'))
     assert(!index_cmds[1].has_key?('key2'))
   end
@@ -628,29 +555,13 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
   def test_request_error
     stub_elastic_ping
     stub_elastic_unavailable
-    driver.emit(sample_record)
     assert_raise(Elasticsearch::Transport::Transport::Errors::ServiceUnavailable) {
-      driver.run
+      driver.run(default_tag: 'test') do
+        driver.feed(sample_record)
+      end
     }
   end
 
-  def test_garbage_record_error
-    stub_elastic_ping
-    stub_elastic
-    driver.emit("some garbage string")
-    driver.run
-  end
-
-  def test_tag_parts_index_error_event
-    stub_elastic_ping
-    stub_elastic
-    driver.configure("logstash_prefix ${tag_parts[1]}\n")
-    flexmock(driver.instance.router).should_receive(:emit_error_event)
-      .with('test', Integer, Hash, TypeError).once
-    driver.emit(sample_record)
-    driver.run
-  end
-
   def test_connection_failed_retry
     connection_resets = 0
 
@@ -662,11 +573,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
       raise Faraday::ConnectionFailed, "Test message"
     end
 
-    driver.emit(sample_record)
-
-    assert_raise(Fluent::ElasticsearchOutput::ConnectionFailure) {
-      driver.run
-    }
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_equal(connection_resets, 3)
   end
 
@@ -680,18 +589,23 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     stub_request(:post, "http://localhost:9200/_bulk").with do |req|
       raise ZeroDivisionError, "any not host_unreachable_exceptions exception"
     end
-
+    
     driver.configure("reconnect_on_error true\n")
-    driver.emit(sample_record)
 
     assert_raise(ZeroDivisionError) {
-      driver.run
+      driver.run(default_tag: 'test', shutdown: false) do
+        driver.feed(sample_record)
+      end
     }
 
-    assert_raise(ZeroDivisionError) {
-      driver.run
+    assert_raise(Timeout::Error) {
+      driver.run(default_tag: 'test', shutdown: false) do
+        driver.feed(sample_record)
+      end
     }
-    assert_equal(connection_resets, 2)
+    # FIXME: Consider keywords arguments in #run and how to test this later.
+    # Because v0.14 test driver does not have 1 to 1 correspondence between #run and #flush in tests.
+    assert_equal(connection_resets, 1)
   end
 
   def test_reconnect_on_error_disabled
@@ -704,16 +618,19 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     stub_request(:post, "http://localhost:9200/_bulk").with do |req|
       raise ZeroDivisionError, "any not host_unreachable_exceptions exception"
     end
-
+    
     driver.configure("reconnect_on_error false\n")
-    driver.emit(sample_record)
 
     assert_raise(ZeroDivisionError) {
-      driver.run
+      driver.run(default_tag: 'test', shutdown: false) do
+        driver.feed(sample_record)
+      end
     }
 
-    assert_raise(ZeroDivisionError) {
-      driver.run
+    assert_raise(Timeout::Error) {
+      driver.run(default_tag: 'test', shutdown: false) do
+        driver.feed(sample_record)
+      end
     }
     assert_equal(connection_resets, 1)
   end
@@ -722,8 +639,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("write_operation update\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_nil(index_cmds)
   end
 
@@ -731,8 +649,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("write_operation upsert\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_nil(index_cmds)
   end
 
@@ -740,8 +659,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.configure("write_operation create\n")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert_nil(index_cmds)
   end
 
@@ -750,8 +670,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
                       id_key request_id")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(index_cmds[0].has_key?("update"))
     assert(!index_cmds[1]["doc_as_upsert"])
   end
@@ -761,8 +682,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
                       id_key request_id")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(index_cmds[0].has_key?("update"))
     assert(index_cmds[1]["doc_as_upsert"])
   end
@@ -772,8 +694,9 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
                       id_key request_id")
     stub_elastic_ping
     stub_elastic
-    driver.emit(sample_record)
-    driver.run
+    driver.run(default_tag: 'test') do
+      driver.feed(sample_record)
+    end
     assert(index_cmds[0].has_key?("create"))
   end
 end