merge revision(s) r49575,r49579: [Backport #10839]

	test_cipher.rb: show cipher name

	* test/openssl/test_cipher.rb (test_ciphers): show wrap mode
  cipher name, which does not end with "wrap".
  http://rubyci.blob.core.windows.net/fedora21/ruby-trunk/log/20150212T061502Z.fail.html.gz

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

1 files changed, 1 insertions, 1 deletions

diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index c87eacce1d..101a75a15b 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -107,7 +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
-          next if /wrap\z/ =~ name and e.message == 'wrap mode not allowed'
+          next if /wrap/ =~ name and e.message == 'wrap mode not allowed'
           raise
         end
       }