mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5
Skipping test for OpenSSL::PKCS5 JRuby
This commit is contained in:
commit
7219c5f319
1 changed files with 10 additions and 0 deletions
|
@ -1,4 +1,12 @@
|
|||
require 'abstract_unit'
|
||||
|
||||
begin
|
||||
require 'openssl'
|
||||
OpenSSL::PKCS5
|
||||
rescue LoadError, NameError
|
||||
$stderr.puts "Skipping KeyGenerator test: broken OpenSSL install"
|
||||
else
|
||||
|
||||
# FIXME remove DummyKeyGenerator and this require in 4.1
|
||||
require 'active_support/key_generator'
|
||||
require 'active_support/message_verifier'
|
||||
|
@ -724,3 +732,5 @@ class CookiesTest < ActionController::TestCase
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue