summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-03 00:48:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-03 00:48:29 +0000
commit5d9eae4abbbefd10cf78e181f9dc0839bf9b1b4d (patch)
treee8361fe6d6bf320539116910012f62a02e8e84ec
parent25e8bfce581b375614ecb1ee57e1839bcff6ae96 (diff)
* test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result):
shouldn't use same server for respective tests, because the 1st test sometimes kills the server main loop silently. [Bug #9881] [ruby-dev:48266] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/openssl/test_ssl.rb4
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ba7cd6ec96..5ffca2b7d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 3 09:45:13 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result):
+ shouldn't use same server for respective tests, because the 1st
+ test sometimes kills the server main loop silently.
+ [Bug #9881] [ruby-dev:48266]
+
Tue Jun 3 01:34:59 2014 Zachary Scott <e@zzak.io>
* README.EXT: [DOC] Add rb_call_super when subclassing from @robin850
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 509dda0096c..ddc3be5b057 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -251,7 +251,9 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ensure
ssl.close
end
+ }
+ start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new
ctx.set_params(
@@ -268,7 +270,9 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ensure
ssl.close
end
+ }
+ start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new
ctx.set_params(