naruse	2015-02-18 12:21:00 +0900 (Wed, 18 Feb 2015)

  New Revision: 49636

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49636

  Log:
    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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/openssl/test_cipher.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49635)
+++ ruby_2_2/version.h	(revision 49636)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-17"
-#define RUBY_PATCHLEVEL 52
+#define RUBY_RELEASE_DATE "2015-02-18"
+#define RUBY_PATCHLEVEL 53
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/openssl/test_cipher.rb
===================================================================
--- ruby_2_2/test/openssl/test_cipher.rb	(revision 49635)
+++ ruby_2_2/test/openssl/test_cipher.rb	(revision 49636)
@@ -107,10 +107,7 @@ class OpenSSL::TestCipher < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/openssl/test_cipher.rb#L107
         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
       }

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49579


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/