summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/thread/test_queue.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6858175be5..63af9c9a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 1 18:37:15 2015 Koichi Sasada <ko1@atdot.net>
+
+ * test/thread/test_queue.rb: catch up last commit.
+
Tue Sep 1 18:16:32 2015 Koichi Sasada <ko1@atdot.net>
* thread_sync.c (queue_do_close): ignore multiple close to allow
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 6195140d58..13cefde641 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -509,11 +509,11 @@ class TestQueue < Test::Unit::TestCase
[->{Queue.new}, ->{SizedQueue.new 3}].each do |qcreate|
q = qcreate[]
q.close
- assert_raise(ClosedQueueError){q.close}
+ assert_nothing_raised(ClosedQueueError){q.close}
q = qcreate[]
q.close(true)
- assert_raise(ClosedQueueError){q.close(false)}
+ assert_nothing_raised(ClosedQueueError){q.close(false)}
end
end