summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/lib/minitest/unit.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 62f809c5ca..b85b760d20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 25 16:54:06 2014 Tanaka Akira <akr@fsij.org>
+
+ * test/lib/minitest/unit.rb: Use Thread.list instead of
+ ObjectSpace.each_object(Thread).
+
Sun May 25 15:53:54 2014 Tanaka Akira <akr@fsij.org>
* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
diff --git a/test/lib/minitest/unit.rb b/test/lib/minitest/unit.rb
index 49d3809cb9..f6176f403a 100644
--- a/test/lib/minitest/unit.rb
+++ b/test/lib/minitest/unit.rb
@@ -947,7 +947,7 @@ module MiniTest
end
def live_thread_and_tempfile
- live_threads = ObjectSpace.each_object(Thread).find_all {|t|
+ live_threads = Thread.list.find_all {|t|
t != Thread.current && t.alive?
}
if defined? Tempfile