1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00

Fix warnings for !HAS_FORK [changelog skip] (#2187)

* Add missing requires in test_puma_server_ssl.rb

* Skip teardown if setup was skipped in test_preserve_bundler_env

* Otherwise we get
puma/test/helpers/integration.rb:27: warning: instance variable @ios_to_close not initialized
puma/test/helpers/integration.rb:34: warning: instance variable @bind_path not initialized
See https://travis-ci.org/github/puma/puma/jobs/662767158#L469
* Same pattern as in test/test_integration_cluster.rb.
This commit is contained in:
Benoit Daloze 2020-03-16 16:29:18 +01:00 committed by GitHub
parent f1819380dc
commit d8b25115d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View file

@ -8,6 +8,7 @@ class TestPreserveBundlerEnv < TestIntegration
end end
def teardown def teardown
return if skipped?
FileUtils.rm current_release_symlink, force: true FileUtils.rm current_release_symlink, force: true
super super
end end

View file

@ -1,6 +1,8 @@
require_relative "helper" require_relative "helper"
require "puma/minissl" require "puma/minissl"
require "puma/puma_http11" require "puma/puma_http11"
require "puma/events"
require "net/http"
#——————————————————————————————————————————————————————————————————————————————— #———————————————————————————————————————————————————————————————————————————————
# NOTE: ALL TESTS BYPASSED IF DISABLE_SSL IS TRUE # NOTE: ALL TESTS BYPASSED IF DISABLE_SSL IS TRUE