merge revision(s) 49579: [Backport #10839]

	test_cipher.rb: ignore wrap mode erros

	* test/openssl/test_cipher.rb (test_ciphers): ignore wrap mode
  errors if "wrap" is contained in the name.  seems no explicit
  rules.
  http://rubyci.blob.core.windows.net/fedora21/ruby-trunk/log/20150213T001502Z.fail.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 4 deletions

diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index 954963acc5..6f92c381cf 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -107,10 +107,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
         begin
           assert_kind_of(OpenSSL::Cipher::Cipher, OpenSSL::Cipher::Cipher.new(name))
         rescue OpenSSL::Cipher::CipherError => e
-          if e.message == 'wrap mode not allowed'
-            assert_match(/wrap\z/, name, e.message)
-            next
-          end
+          next if /wrap/ =~ name and e.message == 'wrap mode not allowed'
           raise
         end
       }