From 64e6d2bd8fb91a19936183604b2c7a6be3b9ab22 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 18 Feb 2015 03:21:00 +0000 Subject: [PATCH] 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 --- test/openssl/test_cipher.rb | 5 +---- version.h | 6 +++--- 2 files changed, 4 insertions(+), 7 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 } diff --git a/version.h b/version.h index d9c143ed28..0de65f0d44 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #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"