diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-08-30 09:49:13 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-08-30 09:49:13 +0200 |
| commit | 4c917dae9a4933b2116d936293a31a8b5159c145 (patch) | |
| tree | 9195b99df30b7426ab901721798dcefd9a72ae43 /actionpack | |
| parent | c67c5e6ba0fd098d25094810ac7243b73a140be1 (diff) | |
| parent | b7ab73a4e21b022cf3415f6eee8018979796e466 (diff) | |
| download | rails-4c917dae9a4933b2116d936293a31a8b5159c145.tar.gz rails-4c917dae9a4933b2116d936293a31a8b5159c145.tar.bz2 rails-4c917dae9a4933b2116d936293a31a8b5159c145.zip | |
Merge pull request #16644 from Agis-/drb-tests-actionpack-vagrant
Use system /tmp for temp files when testing actionpack
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 674fb253f4..e14940d632 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -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 |