summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-25 22:23:34 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-25 22:23:34 +0000
commit14920f93c94ed9dd0dc30892df8d10d5c47d6308 (patch)
tree6c24feb75e1240c7bfcbd58dbce865c74b49baa9
parent7d92e5cf730596429fd33ce7a580112b28528662 (diff)
test/openssl/test_ssl.rb (test_copy_stream): new test
I was worried r52750 would break IO.copy_stream with things like OpenSSL sockets which wrap IOs, but require data to be run through through encryption/decryption filters. Apparently my worry was unfounded, but perhaps this test will ensure this case continues to work. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/openssl/test_ssl.rb14
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bcd54e..225aa36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 26 07:22:55 2015 Eric Wong <e@80x24.org>
+
+ * test/openssl/test_ssl.rb (test_copy_stream): new test
+
Wed Nov 25 21:23:39 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (copy_stream_body): try to_io conversion before read,
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 9e98a21..06e8d96 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -178,6 +178,20 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
}
end
+ def test_copy_stream
+ start_server(OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
+ server_connect(port) do |ssl|
+ IO.pipe do |r, w|
+ str = "hello world\n"
+ w.write(str)
+ IO.copy_stream(r, ssl, str.bytesize)
+ IO.copy_stream(ssl, w, str.bytesize)
+ assert_equal str, r.read(str.bytesize)
+ end
+ end
+ end
+ end
+
def test_client_auth_failure
vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
start_server(vflag, true, :ignore_listener_error => true){|server, port|