summaryrefslogtreecommitdiff
path: root/test/rinda/test_rinda.rb
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-12 18:44:33 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-12 18:44:33 +0000
commit967eab83e333430600926366621aa3a978701c6a (patch)
tree08b7984bafd10906703cb01a1af1b646efadbb0f /test/rinda/test_rinda.rb
parent6671a826ac0531fb8df2b3fceb726f66ddcce5af (diff)
Remove extra assert_nil in Rinda tests
* They are never executed since thread_join() raises. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rinda/test_rinda.rb')
-rw-r--r--test/rinda/test_rinda.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index ddebe54baa..9874e32872 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -359,7 +359,7 @@ module TupleSpaceTestModule
sleep(2)
assert_raise(Rinda::RequestCanceledError) do
- assert_nil(thread_join(taker))
+ thread_join(taker)
end
assert(template.canceled?)
@@ -388,7 +388,7 @@ module TupleSpaceTestModule
sleep(2)
assert_raise(Rinda::RequestCanceledError) do
- assert_nil(thread_join(reader))
+ thread_join(reader)
end
assert(template.canceled?)
@@ -844,4 +844,3 @@ class TestRingFinger < Test::Unit::TestCase
end
end
-