yugui	2010-05-29 14:36:57 +0900 (Sat, 29 May 2010)

  New Revision: 28069

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

  Log:
    merges r28023 and r28024 from trunk into ruby_1_9_2.
    --
    * test/rinda/test_rinda.rb (class TupleSpaceTest): kill a used thread
      at teardown. [ruby-dev:41397]
    * test/rinda/test_rinda.rb (class TupleSpaceProxyTest): ditto.
    --
    * ChangeLog: fix wrong format.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/rinda/test_rinda.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28068)
+++ ruby_1_9_2/ChangeLog	(revision 28069)
@@ -1,3 +1,8 @@
+Wed May 26 18:40:23 2010  Masaya Tarui  <tarui@r...>
+
+	* test/rinda/test_rinda.rb (TupleSpaceTest, TupleSpaceProxyTest):
+	  kill a used thread at teardown.  [ruby-dev:41397]
+
 Wed May 26 11:50:09 2010  Eric Hodel  <drbrain@s...>
 
 	* marshal.c (Init_marshal): document marshal_dump and marshal_load.
Index: ruby_1_9_2/test/rinda/test_rinda.rb
===================================================================
--- ruby_1_9_2/test/rinda/test_rinda.rb	(revision 28068)
+++ ruby_1_9_2/test/rinda/test_rinda.rb	(revision 28069)
@@ -519,6 +519,10 @@
     ThreadGroup.new.add(Thread.current)
     @ts = Rinda::TupleSpace.new(1)
   end
+  def teardown
+    # implementation-dependent
+    @ts.instance_eval{@keeper.kill if @keeper}
+  end
 end
 
 class TupleSpaceProxyTest < Test::Unit::TestCase
@@ -529,6 +533,10 @@
     @ts_base = Rinda::TupleSpace.new(1)
     @ts = Rinda::TupleSpaceProxy.new(@ts_base)
   end
+  def teardown
+    # implementation-dependent
+    @ts_base.instance_eval{@keeper.kill if @keeper}
+  end
 
   def test_remote_array_and_hash
     @ts.write(DRbObject.new([1, 2, 3]))

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