Merge pull request #8 from HatsuneMiku3939/test/more-testcase

add more testcase

Author: HatsuneMiku3939

.gitignore

@@ -4,3 +4,4 @@ TODO
 Gemfile.lock
 coverage/**/*
 *.gem
+*.log

Rakefile

@@ -2,8 +2,14 @@ require "bundler"
 Bundler::GemHelper.install_tasks
 
 require "rake/testtask"
+require "fileutils"
 
 Rake::TestTask.new(:test) do |t|
+  if File.exists? "stub_server.log"
+    puts "clear stub_server.log"
+    FileUtils.rm "stub_server.log"
+  end
+
   t.libs.push("lib", "test")
   t.test_files = FileList["test/**/test_*.rb"]
   t.verbose = true

test/helper.rb

@@ -21,5 +21,8 @@
 
 require "test/unit/rr"
 
+# require stub_server
+require "test/helper/stub_server"
+
 Test::Unit::TestCase.include(Fluent::Test::Helpers)
 Test::Unit::TestCase.extend(Fluent::Test::Helpers)

test/helper/stub_server.rb

@@ -0,0 +1,73 @@
+require 'webrick'
+
+class StubServer
+  def initialize
+    create_server
+
+    # mount handler
+    @server.mount_proc '/', &method(:ok)
+    @server.mount_proc '/not_exist', &method(:not_exist)
+    @server.mount_proc '/timeout', &method(:timeout)
+    @server.mount_proc '/internal_error', &method(:internal_error)
+    @server.mount_proc '/redirect', &method(:redirect)
+  end
+
+  def start
+    @thread = Thread.new { @server.start }
+  end
+
+  def shutdown
+    @server.shutdown
+
+    # wait until webrick was shutting down
+    while true
+      break if @thread.status == false
+
+      # issue webrick shutdown once more
+      @server.shutdown
+      sleep 1
+    end
+
+    # then exit thread
+    @thread.exit
+  end
+
+  private
+  def create_server
+    @log_file = File.open("stub_server.log", "a+")
+    @log = WEBrick::Log.new @log_file
+    @access_log = [
+      [@log_file, WEBrick::AccessLog::COMBINED_LOG_FORMAT],
+    ]
+
+    @server = WEBrick::HTTPServer.new :Port => 3939, :Logger => @log, :AccessLog => @access_log
+  end
+
+  def ok(req, res)
+    res.status = 200
+    res['Content-Type'] = 'application/json'
+    res.body = '{ "status": "OK" }'
+  end
+
+  def not_exist(req, res)
+    res.status = 404
+    res.body = ''
+  end
+
+  def timeout(req, res)
+    sleep 3
+
+    res.status = 200
+    res['Content-Type'] = 'application/json'
+    res.body = '{ "status": "OK" }'
+  end
+
+  def internal_error(req, res)
+    res.status = 500
+    res.body = ''
+  end
+
+  def redirect(req, res)
+    res.set_redirect WEBrick::HTTPStatus::TemporaryRedirect, "http://127.0.0.1:3939/"
+  end
+end

test/plugin/test_in_http_pull.rb

@@ -4,14 +4,23 @@
 require 'ostruct'
 
 class HttpPullInputTest < Test::Unit::TestCase
+  @stub_server = nil
+
   setup do
     Fluent::Test.setup
+
+    @stub_server = StubServer.new
+    @stub_server.start
+  end
+
+  teardown do
+    @stub_server.shutdown
   end
 
   sub_test_case "default value of each options" do
     TEST_DEFAULT_VALUE_CONFIG = %[
       tag test
-      url http://127.0.0.1
+      url http://127.0.0.1:3939
 
       interval 3s
       format json
@@ -32,11 +41,10 @@ class HttpPullInputTest < Test::Unit::TestCase
     end
   end
 
-  sub_test_case "success case with status only" do
+  sub_test_case "success case" do
     TEST_INTERVAL_3_CONFIG = %[
       tag test
-      url http://127.0.0.1
-      timeout 10
+      url http://127.0.0.1:3939
 
       interval 3s
       format none
@@ -45,37 +53,34 @@ class HttpPullInputTest < Test::Unit::TestCase
 
     TEST_INTERVAL_5_CONFIG = %[
       tag test
-      url http://127.0.0.1
-      timeout 10
+      url http://127.0.0.1:3939
 
       interval 5s
       format json
     ]
 
-    setup do
-      mock(RestClient::Request).
-        execute(method: :get,
-                url: "http://127.0.0.1",
-                timeout: 10).
-        times(2) do
-          OpenStruct.new({code: 200, body: '{"status": "OK"}'})
-        end
-    end
+    TEST_INTERVAL_3_REDIRECT_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/redirect
+
+      interval 3s
+      format json
+    ]
 
     test 'interval 3 with status_only' do
       d = create_driver TEST_INTERVAL_3_CONFIG
       assert_equal("test", d.instance.tag)
       assert_equal(3, d.instance.interval)
 
-      d.run(timeout: 5) do
+      d.run(timeout: 8) do
         sleep 7
       end
       assert_equal(2, d.events.size)
 
       d.events.each do |tag, time, record|
         assert_equal("test", tag)
 
-        assert_equal({"url"=>"http://127.0.0.1","status"=>200}, record)
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200}, record)
         assert(time.is_a?(Fluent::EventTime))
       end
     end
@@ -85,20 +90,100 @@ class HttpPullInputTest < Test::Unit::TestCase
       assert_equal("test", d.instance.tag)
       assert_equal(5, d.instance.interval)
 
-      d.run(timeout: 7) do
+      d.run(timeout: 12) do
         sleep 11
       end
       assert_equal(2, d.events.size)
 
       d.events.each do |tag, time, record|
         assert_equal("test", tag)
 
-        assert_equal({"url"=>"http://127.0.0.1","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert_equal({"url"=>"http://127.0.0.1:3939","status"=>200, "message"=>{"status"=>"OK"}}, record)
+        assert(time.is_a?(Fluent::EventTime))
+      end
+    end
+
+    test 'interval 3 with redirect' do
+      d = create_driver TEST_INTERVAL_3_REDIRECT_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal({"url"=>"http://127.0.0.1:3939/redirect","status"=>200, "message"=>{"status"=>"OK"}}, record)
         assert(time.is_a?(Fluent::EventTime))
       end
     end
   end
 
+  sub_test_case "fail when not 200 OK" do
+    TEST_404_INTERVAL_3_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/not_exist
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    TEST_500_INTERVAL_3_CONFIG = %[
+      tag test
+      url http://127.0.0.1:3939/internal_error
+
+      interval 3s
+      format none
+      status_only true
+    ]
+
+    test '404' do
+      d = create_driver TEST_404_INTERVAL_3_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/not_exist", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(404, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+
+    test '500' do
+      d = create_driver TEST_500_INTERVAL_3_CONFIG
+      assert_equal("test", d.instance.tag)
+      assert_equal(3, d.instance.interval)
+
+      d.run(timeout: 8) do
+        sleep 7
+      end
+      assert_equal(2, d.events.size)
+
+      d.events.each do |tag, time, record|
+        assert_equal("test", tag)
+
+        assert_equal("http://127.0.0.1:3939/internal_error", record["url"])
+        assert(time.is_a?(Fluent::EventTime))
+
+        assert_equal(500, record["status"])
+        assert_not_nil(record["error"])
+      end
+    end
+  end
+
   sub_test_case "fail when remote down" do
     TEST_REFUSED_CONFIG = %[
       tag test
@@ -111,7 +196,7 @@ class HttpPullInputTest < Test::Unit::TestCase
       d = create_driver TEST_REFUSED_CONFIG
       assert_equal("test", d.instance.tag)
 
-      d.run(timeout: 2) do
+      d.run(timeout: 4) do
         sleep 3
       end
 
@@ -131,38 +216,27 @@ class HttpPullInputTest < Test::Unit::TestCase
   sub_test_case "fail when remote timeout" do
     TEST_TIMEOUT_FAIL_CONFIG = %[
       tag test
-      url http://127.0.0.1
+      url http://127.0.0.1:3939/timeout
       timeout 2s
 
       interval 3s
       format json
     ]
 
-    setup do
-      mock(RestClient::Request).
-        execute(method: :get,
-                url: "http://127.0.0.1",
-                timeout: 2).
-        times(2) do
-          sleep 2
-          raise RestClient::Exceptions::Timeout.new
-        end
-    end
-
     test "timeout" do
       d = create_driver TEST_TIMEOUT_FAIL_CONFIG
       assert_equal("test", d.instance.tag)
       assert_equal(2, d.instance.timeout)
 
-      d.run(timeout: 5) do
+      d.run(timeout: 8) do
         sleep 7
       end
       assert_equal(2, d.events.size)
 
       d.events.each do |tag, time, record|
         assert_equal("test", tag)
 
-        assert_equal("http://127.0.0.1", record["url"])
+        assert_equal("http://127.0.0.1:3939/timeout", record["url"])
         assert(time.is_a?(Fluent::EventTime))
 
         assert_equal(0, record["status"])