summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-17 10:19:25 +0000
committerrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-17 10:19:25 +0000
commit014da9124a831b194ec0939dbe1270bfd078609a (patch)
tree66f5c1291bc0151d2d6a78dc363704a8d3d30dd6
parentcf6ca2d8b252cd9af0bec374693d2064842078dc (diff)
openssl: really fix test failure on Ubuntu 16.04
* test/openssl/test_ssl.rb (test_ctx_options): Fix test failure on Ubuntu 16.04. The fix in r56147 was incomplete. This is a cherry-pick of the commit b039f3e268c2 at ruby/openssl. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/openssl/test_ssl.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d52e6dcea6..d02b887338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 17 19:19:06 2016 Kazuki Yamaguchi <k@rhe.jp>
+
+ * test/openssl/test_ssl.rb (test_ctx_options): Fix test failure on
+ Ubuntu 16.04. The fix in r56147 was incomplete. This is a cherry-pick
+ of the commit b039f3e268c2 at ruby/openssl.
+
Sat Sep 17 10:49:35 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* doc/extension.ja.rdoc: translate r56130 (rb_check_arity).
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index f7048c3f80..8b4c090b5c 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -10,13 +10,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
assert (OpenSSL::SSL::OP_ALL & ctx.options) == OpenSSL::SSL::OP_ALL,
"OP_ALL is set by default"
- ctx.options = nil
- assert_equal OpenSSL::SSL::OP_ALL, ctx.options
ctx.options = 4
assert_equal 4, ctx.options & 4
if ctx.options != 4
pend "SSL_CTX_set_options() seems to be modified by distributor"
end
+ ctx.options = nil
+ assert_equal OpenSSL::SSL::OP_ALL, ctx.options
assert_equal true, ctx.setup
assert_predicate ctx, :frozen?