mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #40419 from sambostock/handle-portless-memcache-servers
Handle port-less `$MEMCACHE_SERVERS` in `MemCacheStore` tests
This commit is contained in:
commit
efaddc7262
2 changed files with 2 additions and 2 deletions
|
@ -40,7 +40,7 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
|
|||
require "dalli"
|
||||
servers = ENV["MEMCACHE_SERVERS"] || "localhost:11211"
|
||||
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
|
||||
with_test_route_set do
|
||||
|
|
|
@ -27,7 +27,7 @@ class MemCacheStoreTest < ActiveSupport::TestCase
|
|||
begin
|
||||
servers = ENV["MEMCACHE_SERVERS"] || "localhost:11211"
|
||||
ss = Dalli::Client.new(servers).stats
|
||||
raise Dalli::DalliError unless ss[servers]
|
||||
raise Dalli::DalliError unless ss[servers] || ss[servers + ":11211"]
|
||||
|
||||
MEMCACHE_UP = true
|
||||
rescue Dalli::DalliError
|
||||
|
|
Loading…
Reference in a new issue