Permalink
Browse files

Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5

Skipping test for OpenSSL::PKCS5 JRuby
  • Loading branch information...
2 parents b8b3df0 + d67f761 commit 7219c5f31966a1ec1af075bbd4bdeba4e471533c @rafaelfranca rafaelfranca committed Mar 25, 2013
Showing with 10 additions and 0 deletions.
  1. +10 −0 actionpack/test/dispatch/cookies_test.rb
@@ -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 @@ def assert_not_cookie_header(expected)
end
end
end
+
+end

0 comments on commit 7219c5f

Please sign in to comment.