summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-05 23:55:23 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-05 23:55:23 +0000
commit5d983e4fb2d2ede5122941e094cbe2b7d4270b6b (patch)
treeef75c81fc0c469ff989fb40756615d6cfca6260f
parentea67fb97d96b8439bd9ae035651063bdd1b4ddfb (diff)
test/socket/test_nonblock.rb: try to avoid EMSGSIZE
We want to test the IO::WaitWritable behavior, so silently discarding Errno::EMSGSIZE prevents the test from being effective. [ruby-core:69466] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/socket/test_nonblock.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 11c6024164..6518f58b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 6 08:52:13 2015 Eric Wong <[email protected]>
+
+ * test/socket/test_nonblock.rb: try to avoid EMSGSIZE
+ [ruby-core:69466]
+
Sat Jun 6 07:58:30 2015 Koichi Sasada <[email protected]>
* gc.c: remove struct mark_tbl_arg and pass objspace directly
diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index b1959ee2c7..f0fba3af74 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -277,9 +277,9 @@ class TestSocketNonblock < Test::Unit::TestCase
if defined?(UNIXSocket) && defined?(Socket::SOCK_SEQPACKET)
def test_sendmsg_nonblock_seqpacket
- buf = '*' * 10000
+ buf = '*' * 8192
UNIXSocket.pair(:SEQPACKET) do |s1, s2|
- assert_raise(IO::WaitWritable,Errno::EMSGSIZE) do
+ assert_raise(IO::WaitWritable) do
loop { s1.sendmsg_nonblock(buf) }
end
end