summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/thread/test_queue.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ebce687735..666200de0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 18 09:43:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * test/thread/test_queue.rb (test_thr_kill): extend timeout.
+ this test takes a long time at slow machine.
+
Sun Dec 18 09:36:51 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* test/ruby/envutil.rb (invoke_ruby): remove :timeout option before
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 9d2f22ff56..346c2df51a 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -57,9 +57,9 @@ class TestQueue < Test::Unit::TestCase
def test_thr_kill
bug5343 = '[ruby-core:39634]'
- assert_normal_exit(<<-'_eom', bug5343)
+ assert_normal_exit(<<-'_eom', bug5343, {:timeout => 250})
+ require "thread"
2000.times do
- require "thread"
queue = Queue.new
r, w = IO.pipe
th = Thread.start {