kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #40419 from sambostock/handle-portless-memcache-servers

Browse source 
Handle port-less `$MEMCACHE_SERVERS` in `MemCacheStore` tests
This commit is contained in:
Rafael França 2020-10-21 01:15:52 -04:00 committed by GitHub
commit efaddc7262
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/test/dispatch/session/mem_cache_store_test.rb
View file

@ -40,7 +40,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
require "dalli" require "dalli"
servers = ENV["MEMCACHE_SERVERS"] || "localhost:11211" servers = ENV["MEMCACHE_SERVERS"] || "localhost:11211"
ss = Dalli::Client.new(servers).stats ss = Dalli::Client.new(servers).stats
raise Dalli::DalliError unless ss[servers] raise Dalli::DalliError unless ss[servers] || ss[servers + ":11211"]
def test_setting_and_getting_session_value def test_setting_and_getting_session_value
with_test_route_set do with_test_route_set do

2
activesupport/test/cache/stores/mem_cache_store_test.rb vendored
View file

@ -27,7 +27,7 @@ class MemCacheStoreTest < ActiveSupport::TestCase
begin begin
servers = ENV["MEMCACHE_SERVERS"] || "localhost:11211" servers = ENV["MEMCACHE_SERVERS"] || "localhost:11211"
ss = Dalli::Client.new(servers).stats ss = Dalli::Client.new(servers).stats
raise Dalli::DalliError unless ss[servers] raise Dalli::DalliError unless ss[servers] || ss[servers + ":11211"]
MEMCACHE_UP = true MEMCACHE_UP = true
rescue Dalli::DalliError rescue Dalli::DalliError