nobu	2012-01-31 14:29:52 +0900 (Tue, 31 Jan 2012)

  New Revision: 34403

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34403

  Log:
    * test/ruby/test_thread.rb (TestThreadGroup#test_thread_timer_and_interrupt): suppress interrupt message.

  Modified files:
    trunk/test/ruby/test_thread.rb

Index: test/ruby/test_thread.rb
===================================================================
--- test/ruby/test_thread.rb	(revision 34402)
+++ test/ruby/test_thread.rb	(revision 34403)
@@ -689,20 +689,23 @@
   def test_thread_timer_and_interrupt
     bug5757 = '[ruby-dev:44985]'
     t0 = Time.now.to_f
-    pid = spawn(EnvUtil.rubybin, '-e', 'r,=IO.pipe;r.read')
-    sleep 1;
-    Process.kill(:SIGINT, pid)
-    Process.wait(pid)
-    s = $?
-    if /mswin|mingw/ =~ RUBY_PLATFORM
+    pid = nil
+    cmd = 'r,=IO.pipe; Thread.start {Thread.pass until Thread.main.stop?; puts; STDOUT.flush}; r.read'
+    s, err = EnvUtil.invoke_ruby(['-e', cmd], "", true, true) do |in_p, out_p, err_p, cpid|
+      out_p.gets
+      pid = cpid
+      Process.kill(:SIGINT, pid)
+      Process.wait(pid)
+      [$?, err_p.read]
+    end
+    t1 = Time.now.to_f
+    assert_equal(pid, s.pid)
+    unless /mswin|mingw/ =~ RUBY_PLATFORM
       # status of signal is not supported on Windows
-      assert_equal(pid, s.pid)
-    else
-      assert_equal([false, true, false],
-                   [s.exited?, s.signaled?, s.stopped?],
-                   "[s.exited?, s.signaled?, s.stopped?]")
+      assert_equal([false, true, false, Signal.list["INT"]],
+                   [s.exited?, s.signaled?, s.stopped?, s.termsig],
+                   "[s.exited?, s.signaled?, s.stopped?, s.termsig]")
     end
-    t1 = Time.now.to_f
     assert_in_delta(t1 - t0, 1, 1)
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/