rhe	2016-09-17 19:19:25 +0900 (Sat, 17 Sep 2016)

  New Revision: 56178

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56178

  Log:
    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.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_ssl.rb
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 56177)
+++ test/openssl/test_ssl.rb	(revision 56178)
@@ -10,13 +10,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTes https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L10
 
     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?
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56177)
+++ ChangeLog	(revision 56178)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Sep 17 19:19:06 2016  Kazuki Yamaguchi  <k@r...>
+
+	* 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@m...>
 
 	* doc/extension.ja.rdoc: translate r56130 (rb_check_arity).

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/