Handle port-less $MEMCACHE_SERVERS in MemCacheStore tests

Devs may be running tests on a machine which provides $MEMCACHE_SERVERS without a trailing port. We should allow for this when checking if Memcache is working.
rails · Oct 21, 2020 · a812537 · a812537
1 parent 0a608bd
commit a812537
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -40,7 +40,7 @@ def call_reset_session
     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

diff --git a/activesupport/test/cache/stores/mem_cache_store_test.rb b/activesupport/test/cache/stores/mem_cache_store_test.rb
@@ -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