summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_io.rb39
2 files changed, 45 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a8fad1fe5b..0d4d59540e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 11 21:49:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * test/ruby/test_io.rb: Added TestIO#test_cross_thread_close_stdio
+ and TestIO#test_cross_thread_close_fd.
+ The patch was written by Eric Wong. [ruby-core:35669]
+
Mon Apr 11 21:15:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* file.c (rb_group_member): kill 256K of stack usage.
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 6b8e6b58ce..3d086b3750 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1809,4 +1809,43 @@ End
Process.waitpid2(pid)
end
end
+
+ def test_cross_thread_close_fd
+ with_pipe do |r,w|
+ read_thread = Thread.new do
+ begin
+ r.read(1)
+ rescue => e
+ e
+ end
+ end
+
+ sleep(0.1) until read_thread.stop?
+ r.close
+ read_thread.join
+ assert_kind_of(IOError, read_thread.value)
+ end
+ end
+
+ def test_cross_thread_close_stdio
+ with_pipe do |r,w|
+ pid = fork do
+ $stdin.reopen(r)
+ r.close
+ read_thread = Thread.new do
+ begin
+ $stdin.read(1)
+ rescue => e
+ e
+ end
+ end
+ sleep(0.1) until read_thread.stop?
+ $stdin.close
+ read_thread.join
+ exit(IOError === read_thread.value)
+ end
+ assert Process.waitpid2(pid)[1].success?
+ end
+ rescue NotImplementedError
+ end
end