diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-27 21:01:54 +0900 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 19:25:11 -0300 |
| commit | 2a73b5999e27e4c6dd052013bf814c6be965f56a (patch) | |
| tree | 299d36de9652a2ca15f48429214b838b67ec7e5b /actionpack/test | |
| parent | 7008dfba6660d71463d0b82b20ac70e652174325 (diff) | |
| download | rails-2a73b5999e27e4c6dd052013bf814c6be965f56a.tar.gz rails-2a73b5999e27e4c6dd052013bf814c6be965f56a.tar.bz2 rails-2a73b5999e27e4c6dd052013bf814c6be965f56a.zip | |
wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rb
Related: #19617, #19187, #19533, #19689, #19675.
'drb/unix' does not exist on mingw.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 62ff1be5c9..c1be2c9afe 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -14,7 +14,11 @@ silence_warnings do end require 'drb' -require 'drb/unix' +begin + require 'drb/unix' +rescue LoadError + puts "'drb/unix' is not available" +end require 'tempfile' PROCESS_COUNT = (ENV['N'] || 4).to_i |