diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2017-12-30 08:30:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 08:30:24 +0900 |
| commit | a366cc43a408e3aa2ec4cb5561f47ca513ed1c24 (patch) | |
| tree | 32d820ba864bada215b4f20774ba6bbd1f319d6a | |
| parent | df514728ee382a8812a01364420f0d89c9e3bafd (diff) | |
| parent | 09820655f8fa0843250ad439a8d8eff6a19328b3 (diff) | |
| download | rails-a366cc43a408e3aa2ec4cb5561f47ca513ed1c24.tar.gz rails-a366cc43a408e3aa2ec4cb5561f47ca513ed1c24.tar.bz2 rails-a366cc43a408e3aa2ec4cb5561f47ca513ed1c24.zip | |
Merge pull request #31591 from nobu/patch-2
let drb make temprary server
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index deffa63e12..f4787ed27a 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -380,10 +380,8 @@ class ForkingExecutor def initialize(size) @size = size @queue = Server.new - file = File.join Dir.tmpdir, tmpname - @url = "drbunix://#{file}" @pool = nil - DRb.start_service @url, @queue + @url = DRb.start_service("drbunix:", @queue).uri end def <<(work); @queue << work; end @@ -422,11 +420,6 @@ 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 |