[前][次][番号順一覧][スレッド一覧]

ruby-changes:25882

From: tarui <ko1@a...>
Date: Wed, 28 Nov 2012 22:24:46 +0900 (JST)
Subject: [ruby-changes:25882] tarui:r37939 (trunk): * test/ruby/test_thread.rb (test_thread_status_in_trap): change test for

tarui	2012-11-28 22:24:36 +0900 (Wed, 28 Nov 2012)

  New Revision: 37939

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

  Log:
    * test/ruby/test_thread.rb (test_thread_status_in_trap): change test for
      thread status in trap. now can accept Thread#join and Thread#value in trap.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37938)
+++ ChangeLog	(revision 37939)
@@ -1,3 +1,8 @@
+Wed Nov 28 22:20:55 2012  Masaya Tarui  <tarui@r...>
+
+	* test/ruby/test_thread.rb (test_thread_status_in_trap): change test for
+	  thread status in trap. now can accept Thread#join and Thread#value in trap.
+
 Wed Nov 28 21:58:47 2012  Koichi Sasada  <ko1@a...>
 
 	* include/ruby/thread.h (rb_thread_call_without_gvl2): change
Index: test/ruby/test_thread.rb
===================================================================
--- test/ruby/test_thread.rb	(revision 37938)
+++ test/ruby/test_thread.rb	(revision 37939)
@@ -857,7 +857,7 @@
   end
 
   def test_thread_join_in_trap
-    assert_raise(ThreadError) {
+    assert_nothing_raised{
       t = Thread.new{ sleep 0.2; Process.kill(:INT, $$) }
 
       Signal.trap :INT do
@@ -867,16 +867,16 @@
       t.join
     }
 
-    assert_raise(ThreadError) {
-      t = Thread.new{ sleep 0.2; Process.kill(:INT, $$) }
-
-      Signal.trap :INT do
-        t.value
-      end
-
-      t.value
-    }
-
+    assert_equal(:normal_end,
+                 begin
+                   t = Thread.new{ sleep 0.2; Process.kill(:INT, $$); :normal_end }
+                   
+                   Signal.trap :INT do
+                     t.value
+                   end
+                   t.value
+                 end
+                 )
   end
 
   def test_thread_join_current

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

[前][次][番号順一覧][スレッド一覧]