From 2039e616b6b281a8c24ef6d5eef84b63bed394ad Mon Sep 17 00:00:00 2001
From: Shohei Umemoto <cafedomancer@gmail.com>
Date: Thu, 15 Sep 2022 14:47:52 +0900
Subject: [PATCH] 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>
---
 lib/puma/server.rb           |  5 -----
 test/test_integration_ssl.rb |  5 +++--
 test/test_persistent.rb      | 11 ++++++-----
 test/test_puma_server.rb     |  2 +-
 test/test_response_header.rb |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/puma/server.rb b/lib/puma/server.rb
index 3c2985b0d2..386444e621 100644
--- a/lib/puma/server.rb
+++ b/lib/puma/server.rb
@@ -46,11 +46,6 @@ class Server
       :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
 
diff --git a/test/test_integration_ssl.rb b/test/test_integration_ssl.rb
index 628e648f36..1b6d2b77e8 100644
--- a/test/test_integration_ssl.rb
+++ b/test/test_integration_ssl.rb
@@ -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 @@ def test_ssl_run_with_curl_client
     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__),
diff --git a/test/test_persistent.rb b/test/test_persistent.rb
index be90d09b9c..7efe30c1e9 100644
--- a/test/test_persistent.rb
+++ b/test/test_persistent.rb
@@ -1,4 +1,5 @@
 require_relative "helper"
+require "puma/log_writer"
 
 class TestPersistent < Minitest::Test
 
@@ -23,9 +24,9 @@ def setup
       [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 @@ def test_one_with_keep_alive_header
   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 @@ def test_allow_app_to_chunk_itself
 
 
   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 @@ def test_two_requests_in_one_chunk
   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"
diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
index d3f04011be..1302bf47f0 100644
--- a/test/test_puma_server.rb
+++ b/test/test_puma_server.rb
@@ -529,7 +529,7 @@ def test_timeout_data_no_queue
 
   # 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"
diff --git a/test/test_response_header.rb b/test/test_response_header.rb
index 256a25589d..f08c62882a 100644
--- a/test/test_response_header.rb
+++ b/test/test_response_header.rb
@@ -28,7 +28,7 @@ def teardown
   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