mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Remove unused attr_writer (#2955)
* Remove unused attr_writer * Configure some options to fix tests Co-authored-by: MSP-Greg <Greg.mpls@gmail.com> Co-authored-by: MSP-Greg <Greg.mpls@gmail.com>
This commit is contained in:
parent
0a57ffdc81
commit
2039e616b6
5 changed files with 11 additions and 14 deletions
|
@ -46,11 +46,6 @@ module Puma
|
|||
:leak_stack_on_error,
|
||||
:persistent_timeout, :reaping_time
|
||||
|
||||
# @deprecated v6.0.0
|
||||
attr_writer :auto_trim_time, :early_hints, :first_data_timeout,
|
||||
:leak_stack_on_error, :min_threads, :max_threads,
|
||||
:persistent_timeout, :reaping_time
|
||||
|
||||
attr_accessor :app
|
||||
attr_accessor :binder
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require_relative 'helper'
|
||||
require_relative "helpers/integration"
|
||||
require "puma/log_writer"
|
||||
|
||||
# These tests are used to verify that Puma works with SSL sockets. Only
|
||||
# integration tests isolate the server from the test environment, so there
|
||||
|
@ -97,8 +98,8 @@ RUBY
|
|||
skip_if :windows; require 'stringio'
|
||||
|
||||
app = lambda { |_| [200, { 'Content-Type' => 'text/plain' }, ["HELLO", ' ', "THERE"]] }
|
||||
server = Puma::Server.new(app)
|
||||
server.max_threads = 1
|
||||
opts = {max_threads: 1}
|
||||
server = Puma::Server.new app, Puma::LogWriter.stdio, Puma::Events.new, opts
|
||||
if Puma.jruby?
|
||||
ssl_params = {
|
||||
'keystore' => File.expand_path('../examples/puma/client-certs/keystore.jks', __dir__),
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
require_relative "helper"
|
||||
require "puma/log_writer"
|
||||
|
||||
class TestPersistent < Minitest::Test
|
||||
|
||||
|
@ -23,9 +24,9 @@ class TestPersistent < Minitest::Test
|
|||
[status, @headers, @body]
|
||||
end
|
||||
|
||||
@server = Puma::Server.new @simple
|
||||
opts = {max_threads: 1}
|
||||
@server = Puma::Server.new @simple, Puma::LogWriter.stdio, Puma::Events.new, opts
|
||||
@port = (@server.add_tcp_listener HOST, 0).addr[1]
|
||||
@server.max_threads = 1
|
||||
@server.run
|
||||
sleep 0.15 if Puma.jruby?
|
||||
@client = TCPSocket.new HOST, @port
|
||||
|
@ -156,7 +157,7 @@ class TestPersistent < Minitest::Test
|
|||
end
|
||||
|
||||
def test_persistent_timeout
|
||||
@server.persistent_timeout = 1
|
||||
@server.instance_variable_set(:@persistent_timeout, 1)
|
||||
@client << @valid_request
|
||||
sz = @body[0].size.to_s
|
||||
|
||||
|
@ -193,7 +194,7 @@ class TestPersistent < Minitest::Test
|
|||
|
||||
|
||||
def test_two_requests_in_one_chunk
|
||||
@server.persistent_timeout = 3
|
||||
@server.instance_variable_set(:@persistent_timeout, 3)
|
||||
|
||||
req = @valid_request.to_s
|
||||
req += "GET /second HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\n\r\n"
|
||||
|
@ -210,7 +211,7 @@ class TestPersistent < Minitest::Test
|
|||
end
|
||||
|
||||
def test_second_request_not_in_first_req_body
|
||||
@server.persistent_timeout = 3
|
||||
@server.instance_variable_set(:@persistent_timeout, 3)
|
||||
|
||||
req = @valid_request.to_s
|
||||
req += "GET /second HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\n\r\n"
|
||||
|
|
|
@ -529,7 +529,7 @@ EOF
|
|||
|
||||
# https://github.com/puma/puma/issues/2574
|
||||
def test_no_timeout_after_data_received
|
||||
@server.first_data_timeout = 1
|
||||
@server.instance_variable_set(:@first_data_timeout, 1)
|
||||
server_run
|
||||
|
||||
sock = send_http "POST / HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\nContent-Length: 11\r\n\r\n"
|
||||
|
|
|
@ -28,7 +28,7 @@ class TestResponseHeader < Minitest::Test
|
|||
def server_run(app: @app, early_hints: false)
|
||||
@server.app = app
|
||||
@port = (@server.add_tcp_listener @host, 0).addr[1]
|
||||
@server.early_hints = true if early_hints
|
||||
@server.instance_variable_set(:@early_hints, true) if early_hints
|
||||
@server.run
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue