From 5bc61ceddec4f15b407b0fa8e435f816355d5506 Mon Sep 17 00:00:00 2001 From: rhe Date: Tue, 13 Sep 2016 05:59:53 +0000 Subject: openssl: workaround for Ubuntu's patched OpenSSL * test/openssl/test_ssl.rb (test_ctx_options): Add a workaround for patched OpenSSL to fix the Ruby CI failure on Ubuntu 16.04. http://rubyci.s3.amazonaws.com/ubuntu/ruby-trunk/log/20160913T033003Z.fail.html.gz This commit is a cherry-pick of the following commit at ruby/openssl: https://github.com/ruby/openssl/commit/f9c04779a84b45d85dc26dc19ea600d0613539e2 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_ssl.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 0af93a8bc2..f7048c3f80 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -10,10 +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 = 4 - assert_equal 4, ctx.options 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 assert_equal true, ctx.setup assert_predicate ctx, :frozen? -- cgit v1.2.3