From d8b25115d4c377d2490491f9f9328862d5763292 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 16 Mar 2020 16:29:18 +0100 Subject: [PATCH] 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. --- test/test_preserve_bundler_env.rb | 1 + test/test_puma_server_ssl.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/test/test_preserve_bundler_env.rb b/test/test_preserve_bundler_env.rb index 6f082f30..9b4c200f 100644 --- a/test/test_preserve_bundler_env.rb +++ b/test/test_preserve_bundler_env.rb @@ -8,6 +8,7 @@ class TestPreserveBundlerEnv < TestIntegration end def teardown + return if skipped? FileUtils.rm current_release_symlink, force: true super end diff --git a/test/test_puma_server_ssl.rb b/test/test_puma_server_ssl.rb index 26707311..a610767c 100644 --- a/test/test_puma_server_ssl.rb +++ b/test/test_puma_server_ssl.rb @@ -1,6 +1,8 @@ require_relative "helper" require "puma/minissl" require "puma/puma_http11" +require "puma/events" +require "net/http" #——————————————————————————————————————————————————————————————————————————————— # NOTE: ALL TESTS BYPASSED IF DISABLE_SSL IS TRUE