diff options
| author | Agis- <corestudiosinc@gmail.com> | 2014-08-22 21:55:50 +0300 |
|---|---|---|
| committer | Agis- <corestudiosinc@gmail.com> | 2014-08-22 22:03:41 +0300 |
| commit | b7ab73a4e21b022cf3415f6eee8018979796e466 (patch) | |
| tree | 3065c751b9cefb7af76fa0707fc866fb7a6d2ce1 /actionpack | |
| parent | b47d8dea25aa4c1b0d02603adc00cf63f2163f21 (diff) | |
| download | rails-b7ab73a4e21b022cf3415f6eee8018979796e466.tar.gz rails-b7ab73a4e21b022cf3415f6eee8018979796e466.tar.bz2 rails-b7ab73a4e21b022cf3415f6eee8018979796e466.zip | |
Use system /tmp when testing actionpack
https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364
added support and enabled parallel execution of the actionpack tests.
However it introduced https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364
since one cannot connect to a socket file that's inside a Vagrant synced folder
due to security restrictions, and DRb tries to.
Also rename the temporary files to make it obvious that they're rails-related,
since now they're placed outside the project's directory.
Fixes https://github.com/rails/rails/commit/c64bff2c87ebf363703c63ecd4a96d56a1a78364
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 |