summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrhe <rhe@ruby-lang.org>2016-09-17 10:19:25 +0000
committerrhe <rhe@ruby-lang.org>2016-09-17 10:19:25 +0000
commitbe92a7807220eb4b5556d2a15190a29d65b8ca8b (patch)
treeca23eef87d66e64b33abbffef5aac21d4dd26688
parent2fddb9310296335459d0d1feb719c61ae46d5e45 (diff)
downloadruby-openssl-history-be92a7807220eb4b5556d2a15190a29d65b8ca8b.tar.gz
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--test/test_ssl.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_ssl.rb b/test/test_ssl.rb
index f7048c3..8b4c090 100644
--- a/test/test_ssl.rb
+++ b/test/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?