summaryrefslogtreecommitdiff
path: root/test/thread/test_cv.rb
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-12 18:44:49 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-12 18:44:49 +0000
commit15689ed7780b06ddc14cde4f427de834177283a5 (patch)
treebed64f4fdaf3e1a140642bdd0354384ae286759c /test/thread/test_cv.rb
parent967eab83e333430600926366621aa3a978701c6a (diff)
Fix test-all tests to avoid creating report_on_exception warnings
* The warnings are shown by Thread.report_on_exception defaulting to true. [Feature #14143] [ruby-core:83979] * Improves tests by narrowing down the scope where an exception is expected. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/thread/test_cv.rb')
-rw-r--r--test/thread/test_cv.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/thread/test_cv.rb b/test/thread/test_cv.rb
index 702462606dd..1e15d2e9ec3 100644
--- a/test/thread/test_cv.rb
+++ b/test/thread/test_cv.rb
@@ -42,12 +42,10 @@ class TestConditionVariable < Test::Unit::TestCase
thread = Thread.new do
Thread.current.abort_on_exception = false
mutex.synchronize do
- begin
+ assert_raise(Interrupt) {
condvar.wait(mutex)
- rescue Exception
- locked = mutex.locked?
- raise
- end
+ }
+ locked = mutex.locked?
end
end
@@ -56,7 +54,7 @@ class TestConditionVariable < Test::Unit::TestCase
end
thread.raise Interrupt, "interrupt a dead condition variable"
- assert_raise(Interrupt) { thread.value }
+ thread.join
assert(locked)
end