aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/ruby/test_process.rb10
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f007e2cd7..65e405234e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,7 @@
-Mon Nov 26 01:54:26 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Nov 26 10:50:19 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * test/ruby/test_process.rb (test_setsid): call Process.getsid for
- child process in child process. because parent process call
- Process.getsid with io.pid, Errno::ESRCH could be raised.
+ * test/ruby/test_process.rb (test_setsid): added a few wait for
+ preventing that Process.getsid(io.pid) makes Errno::ESRCH.
Sun Nov 25 22:34:00 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index c5c9d8af79..46c194f83d 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1566,13 +1566,15 @@ class TestProcess < Test::Unit::TestCase
Marshal.dump(Process.getsid, STDOUT)
newsid = Process.setsid
Marshal.dump(newsid, STDOUT)
- Marshal.dump(Process.getsid($$), STDOUT)
STDOUT.flush
+ sleep 3
EOS
+
+ # test Process.getsid() w/o arg
assert_equal(Marshal.load(io), Process.getsid)
- newsid = Marshal.load(io)
- getsid = Marshal.load(io)
- assert_equal(newsid, getsid)
+ # test Process.setsid return value and Process::getsid(pid)
+ assert_equal(Marshal.load(io), Process.getsid(io.pid))
+ Process.kill(:KILL, io.pid)
end
end
end