From cc0d272c8c37c197a7e68633e5f082eccb2e3737 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Fri, 15 Dec 2017 11:08:57 +0900
Subject: Generate tmpname on its own

`make_tmpname` was removed by https://github.com/ruby/ruby/commit/25d56ea7b7b52dc81af30c92a9a0e2d2dab6ff27.
In this case, we want a file name, not a `File`. So cannot use `Tempfile`.

Fixes #31458
---
 actionpack/test/abstract_unit.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'actionpack/test/abstract_unit.rb')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 55ad9c245e..deffa63e12 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -380,7 +380,7 @@ class ForkingExecutor
   def initialize(size)
     @size  = size
     @queue = Server.new
-    file   = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname("rails-tests", "fd")
+    file   = File.join Dir.tmpdir, tmpname
     @url   = "drbunix://#{file}"
     @pool  = nil
     DRb.start_service @url, @queue
@@ -422,6 +422,11 @@ class ForkingExecutor
         end
       }
     end
+
+    def tmpname
+      t = Time.now.strftime("%Y%m%d")
+      "rails-tests-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-fd"
+    end
 end
 
 if RUBY_ENGINE == "ruby" && PROCESS_COUNT > 0
-- 
cgit v1.2.3