summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/io/wait/test_io_wait.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4103273359..dc66787cda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 29 17:11:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/io/wait/test_io_wait.rb (TestIOWait#fill_pipe):
+ Errno::EWOULDBLOCK may not be the same as Errno::EAGAIN. patch by
+ phasis68 (Heesob Park) at [ruby-core:49894]. [Bug #7420]
+
Thu Nov 29 17:03:38 2012 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/test_case.rb: Determine path to certificates to avoid
diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb
index 676809cfc7..6a33e64a8b 100644
--- a/test/io/wait/test_io_wait.rb
+++ b/test/io/wait/test_io_wait.rb
@@ -101,7 +101,7 @@ private
buf = " " * 4096
begin
written += @w.write_nonblock(buf)
- rescue Errno::EAGAIN
+ rescue Errno::EAGAIN, Errno::EWOULDBLOCK
return written
end while true
end