From cc5ce0ede766c72f378f4872b911e707bcc0c3a3 Mon Sep 17 00:00:00 2001 From: schneems Date: Tue, 20 Mar 2018 12:37:24 -0500 Subject: [PATCH 1/2] Make travis more predictable Introduced in #1540 tests for Ruby 2.2.9 fail randomly. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59893c7957..af35980111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ branches: only: - "master" rvm: - - 2.2.9 + - 2.2.8 - 2.3.6 - 2.4.3 - 2.5.0 From 8c0863002a091b929834a6f99f17548f485b62ee Mon Sep 17 00:00:00 2001 From: schneems Date: Tue, 20 Mar 2018 13:20:24 -0500 Subject: [PATCH 2/2] Fix tests Broke after #1500. --- test/test_puma_server_ssl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_puma_server_ssl.rb b/test/test_puma_server_ssl.rb index 5d7a38e9cd..43cc5dc5fc 100644 --- a/test/test_puma_server_ssl.rb +++ b/test/test_puma_server_ssl.rb @@ -22,8 +22,8 @@ class TestPumaServerSSL < Minitest::Test def setup skip("SSL isn't used.") if DISABLE_SSL - @port = 3212 - @host = "127.0.0.1" + port = 3212 + host = "127.0.0.1" app = lambda { |env| [200, {}, [env['rack.url_scheme']]] }