kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
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
This commit is contained in:
naruse 2015-02-18 03:21:00 +00:00
parent 00088b97ec
commit 64e6d2bd8f
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/openssl/test_cipher.rb
View file

@ -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
}

6
version.h
View file

@ -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"