Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 14 additions & 29 deletions test/plugin/test_out_http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,27 @@ class HTTPOutputTest < Test::Unit::TestCase
DEFAULT_LOGGER = ::WEBrick::Log.new(::STDOUT, ::WEBrick::BasicLog::FATAL)

class << self
# Use class variable to reduce server start/shutdown time
# Share one server in each test case to reduce server start/shutdown time.
# Don't use a class variable for it, because sub test cases share it
# and lose the server of the parent test case.
attr_accessor :http_server_thread, :server_port

def startup
@@result = nil
@@auth_handler = nil
@@http_server_thread = nil
@http_server_thread = nil
@server_port = unused_port(protocol: :tcp)
end

def shutdown
@@http_server_thread.kill
@@http_server_thread.join
@http_server_thread.kill
@http_server_thread.join
rescue
end
end

def server_port
19880
self.class.server_port
end

def base_endpoint
Expand Down Expand Up @@ -130,7 +135,7 @@ def run_http_server
FileUtils.rm_rf(TMP_DIR)

@@result = Result.new(nil, nil, {}, nil)
@@http_server_thread ||= Thread.new do
self.class.http_server_thread ||= Thread.new do
run_http_server
end

Expand Down Expand Up @@ -360,10 +365,6 @@ def test_write_with_disabled_unrecoverable
FileUtils.rm_rf(TMP_DIR)
end

def server_port
19881
end

def test_basic_auth
d = create_driver(config + %[
<auth>
Expand Down Expand Up @@ -416,10 +417,6 @@ def test_basic_auth_with_invalid_auth
)
end

def server_port
19883
end

def test_aws_sigv4_sts_role_arn
stub(Aws::AssumeRoleCredentials).new do |credentials_provider|
stub(credentials_provider).credentials {
Expand Down Expand Up @@ -498,10 +495,6 @@ def test_aws_sigv4_no_role
end

sub_test_case 'HTTPS' do
def server_port
19882
end

def server_config
config = super
# WEBrick supports self-generated self-signed certificate
Expand Down Expand Up @@ -537,10 +530,6 @@ def test_write_with_https
end

sub_test_case 'GZIP' do
def server_port
19882
end

data(:json_array, [false, true])
data(:buffer_compress, ["text", "gzip"])
def test_write_with_gzip
Expand Down Expand Up @@ -572,10 +561,6 @@ def test_write_with_gzip
end

sub_test_case 'connection_reuse' do
def server_port
19883
end

def test_connection_recreation
d = create_driver(%[
endpoint http://127.0.0.1:#{server_port}/test
Expand All @@ -589,9 +574,9 @@ def test_connection_recreation
data = @@result.data

# Restart server to simulate connection loss
@@http_server_thread.kill
@@http_server_thread.join
@@http_server_thread = Thread.new do
self.class.http_server_thread.kill
self.class.http_server_thread.join
self.class.http_server_thread = Thread.new do
run_http_server
end

Expand Down
Loading