Skip to content

Commit

Permalink
revert portion of fa178f3 due to 65a821a test_config.rb
Browse files Browse the repository at this point in the history
  • Loading branch information
MSP-Greg committed Dec 14, 2021
1 parent 65a821a commit 65f0ced
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions test/test_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ def test_ssl_bind_jruby
assert_equal [ssl_binding], conf.options[:binds]
end




def test_ssl_bind_no_tlsv1_1
skip_if :jruby
skip_unless :ssl
Expand Down Expand Up @@ -412,18 +409,6 @@ def assert_run_hooks(hook_name, options = {})
end
end

# contains tests that cannot run parallel
class TestConfigFileSingle < TestConfigFileBase
def test_custom_logger_from_DSL
conf = Puma::Configuration.new { |c| c.load 'test/config/custom_logger.rb' }

conf.load
out, _ = capture_subprocess_io { conf.options[:logger].write 'test' }

assert_equal 'Custom logging: test', out
end
end

# Thread unsafe modification of ENV
class TestEnvModifificationConfig < TestConfigFileBase
def test_double_bind_port
Expand Down

0 comments on commit 65f0ced

Please sign in to comment.