mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #16644 from Agis-/drb-tests-actionpack-vagrant
Use system /tmp for temp files when testing actionpack
This commit is contained in:
commit
4c917dae9a
1 changed files with 1 additions and 3 deletions
|
@ -4,8 +4,6 @@ $:.unshift(File.dirname(__FILE__) + '/lib')
|
|||
$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
|
||||
$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
|
||||
|
||||
ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
|
||||
|
||||
require 'active_support/core_ext/kernel/reporting'
|
||||
|
||||
# These are the normal settings that will be set up by Railties
|
||||
|
@ -466,7 +464,7 @@ class ForkingExecutor
|
|||
def initialize size
|
||||
@size = size
|
||||
@queue = Server.new
|
||||
file = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname('tests', 'fd')
|
||||
file = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname('rails-tests', 'fd')
|
||||
@url = "drbunix://#{file}"
|
||||
@pool = nil
|
||||
DRb.start_service @url, @queue
|
||||
|
|
Loading…
Reference in a new issue