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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d460b23630..75897fb907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 26 18:40:23 2010  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* 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@segment7.net>
 
 	* marshal.c (Init_marshal): document marshal_dump and marshal_load.
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 0d94cf70da..b69b63ac78 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -519,6 +519,10 @@ class TupleSpaceTest < Test::Unit::TestCase
     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 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
     @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]))