summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-11-30 20:28:22 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-11-30 20:28:22 +0900
commit29a2ba8efc0c7bc9e1a6f29d8e9c8f0f25924ed5 (patch)
tree4ded93170f6e1beec841acb92f9883fc39fbba9e
parenta277acf8d4536d212baf8820dc22eeb229bbf71d (diff)
parentd440a0156abddda77c7a9d3649e9491af49e879a (diff)
downloadruby-openssl-29a2ba8efc0c7bc9e1a6f29d8e9c8f0f25924ed5.tar.gz
Merge changes from Ruby trunk r56492..r56927
* ruby-trunk r56492..r56927: (2 commits) (r56927) parse.y: ambiguous parentheses (r56578) openssl/ut_eof.rb: rename TestEOF Sync-with-trunk: r56927
-rw-r--r--lib/openssl/buffering.rb2
-rw-r--r--test/test_pair.rb8
-rw-r--r--test/ut_eof.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/openssl/buffering.rb b/lib/openssl/buffering.rb
index 0db231f9..7fd647ca 100644
--- a/lib/openssl/buffering.rb
+++ b/lib/openssl/buffering.rb
@@ -389,7 +389,7 @@ module OpenSSL::Buffering
# Writes +s+ to the stream. +s+ will be converted to a String using
# String#to_s.
- def << (s)
+ def <<(s)
do_write(s)
self
end
diff --git a/test/test_pair.rb b/test/test_pair.rb
index 5fbb77e7..ad65327d 100644
--- a/test/test_pair.rb
+++ b/test/test_pair.rb
@@ -457,25 +457,25 @@ module OpenSSL::TestPairM
end
class OpenSSL::TestEOF1 < OpenSSL::TestCase
- include TestEOF
+ include OpenSSL::TestEOF
include OpenSSL::SSLPair
include OpenSSL::TestEOF1M
end
class OpenSSL::TestEOF1LowlevelSocket < OpenSSL::TestCase
- include TestEOF
+ include OpenSSL::TestEOF
include OpenSSL::SSLPairLowlevelSocket
include OpenSSL::TestEOF1M
end
class OpenSSL::TestEOF2 < OpenSSL::TestCase
- include TestEOF
+ include OpenSSL::TestEOF
include OpenSSL::SSLPair
include OpenSSL::TestEOF2M
end
class OpenSSL::TestEOF2LowlevelSocket < OpenSSL::TestCase
- include TestEOF
+ include OpenSSL::TestEOF
include OpenSSL::SSLPairLowlevelSocket
include OpenSSL::TestEOF2M
end
diff --git a/test/ut_eof.rb b/test/ut_eof.rb
index fcd7a639..6de41c4a 100644
--- a/test/ut_eof.rb
+++ b/test/ut_eof.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
require 'test/unit'
-module TestEOF
+module OpenSSL::TestEOF
def test_eof_0
open_file("") {|f|
assert_equal("", f.read(0))