Merge pull request rails#46792 from codeminator/fix-flaky-tests

Increase `socket_timeout` for Memcached inside memcached tests

Author: matthewd

actionpack/test/dispatch/session/mem_cache_store_test.rb

@@ -198,7 +198,8 @@ def with_test_route_set
         @app = self.class.build_app(set) do |middleware|
           middleware.use ActionDispatch::Session::MemCacheStore,
             key: "_session_id", namespace: "mem_cache_store_test:#{SecureRandom.hex(10)}",
-            memcache_server: ENV["MEMCACHE_SERVERS"] || "localhost:11211"
+            memcache_server: ENV["MEMCACHE_SERVERS"] || "localhost:11211",
+            socket_timeout: 60
           middleware.delete ActionDispatch::ShowExceptions
         end
 

activesupport/test/cache/stores/mem_cache_store_test.rb

@@ -45,7 +45,7 @@ def ensure_connected! # after https://github.com/petergoldstein/dalli/pull/863
   end
 
   def lookup_store(*addresses, **options)
-    cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, *addresses, { namespace: @namespace, pool: false }.merge(options))
+    cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, *addresses, { namespace: @namespace, pool: false, socket_timeout: 60 }.merge(options))
     (@_stores ||= []) << cache
     cache
   end
@@ -179,7 +179,7 @@ def test_write_expires_at
     cache = lookup_store(raw: true, namespace: nil)
 
     Time.stub(:now, Time.now) do
-      assert_called_with client(cache), :set, ["key_with_expires_at", "bar", 30 * 60], namespace: nil, pool: false, raw: true, compress_threshold: 1024, expires_in: 1800.0 do
+      assert_called_with client(cache), :set, ["key_with_expires_at", "bar", 30 * 60], namespace: nil, pool: false, raw: true, compress_threshold: 1024, expires_in: 1800.0, socket_timeout: 60 do
         cache.write("key_with_expires_at", "bar", expires_at: 30.minutes.from_now)
       end
     end
@@ -265,7 +265,7 @@ def test_no_multiple_compress
   def test_unless_exist_expires_when_configured
     cache = lookup_store(namespace: nil)
 
-    assert_called_with client(cache), :add, ["foo", Object, 1], namespace: nil, pool: false, compress_threshold: 1024, expires_in: 1, unless_exist: true do
+    assert_called_with client(cache), :add, ["foo", Object, 1], namespace: nil, pool: false, compress_threshold: 1024, expires_in: 1, socket_timeout: 60, unless_exist: true do
       cache.write("foo", "bar", expires_in: 1, unless_exist: true)
     end
   end