mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Revert "Try increasing read timeout of rinda tests"
This reverts commit 5c03e4680e
.
I gave up stabilizing Rinda::TupleSpaceProxyTest#test_cancel_02. As the
test uses sleep, it's probably not gonna be stable with --jit-wait.
http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3028276
http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3028065
http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3027857
http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3027441
This commit is contained in:
parent
600f3990d6
commit
609ac6ee2c
1 changed files with 3 additions and 8 deletions
|
@ -382,7 +382,7 @@ module TupleSpaceTestModule
|
|||
template = nil
|
||||
taker = Thread.new do
|
||||
assert_raise(Rinda::RequestCanceledError) do
|
||||
@ts.take([:take, nil], read_timeout) do |t|
|
||||
@ts.take([:take, nil], 10) do |t|
|
||||
template = t
|
||||
Thread.new do
|
||||
template.cancel
|
||||
|
@ -402,6 +402,7 @@ module TupleSpaceTestModule
|
|||
end
|
||||
|
||||
def test_cancel_02
|
||||
skip 'this test is unstable with --jit-wait' if RubyVM::MJIT.enabled?
|
||||
entry = @ts.write([:removeme, 1])
|
||||
assert_equal([[:removeme, 1]], @ts.read_all([nil, nil]))
|
||||
entry.cancel
|
||||
|
@ -410,7 +411,7 @@ module TupleSpaceTestModule
|
|||
template = nil
|
||||
reader = Thread.new do
|
||||
assert_raise(Rinda::RequestCanceledError) do
|
||||
@ts.read([:take, nil], read_timeout) do |t|
|
||||
@ts.read([:take, nil], 10) do |t|
|
||||
template = t
|
||||
Thread.new do
|
||||
template.cancel
|
||||
|
@ -469,12 +470,6 @@ module TupleSpaceTestModule
|
|||
assert(tuple.expired?)
|
||||
assert(!tuple.alive?)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def read_timeout
|
||||
RubyVM::MJIT.enabled? ? 300 : 10 # for --jit-wait
|
||||
end
|
||||
end
|
||||
|
||||
class TupleSpaceTest < Test::Unit::TestCase
|
||||
|
|
Loading…
Reference in a new issue