1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

fixed fails occasionally [ruby-dev:37119]. thanks, shinichiro.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
seki 2008-11-18 18:05:28 +00:00
parent 1da55b38fa
commit 9b3e241bfc
2 changed files with 17 additions and 10 deletions

View file

@ -1,3 +1,8 @@
Wed Nov 19 03:01:04 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].
thanks, shinichiro.h.
Wed Nov 19 02:39:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (Init_syserr): moved function definition itself from

View file

@ -317,8 +317,8 @@ module TupleSpaceTestModule
def test_core_03_notify
notify1 = @ts.notify(nil, [:req, Integer])
notify2 = @ts.notify(nil, [:ans, Integer], 5)
notify3 = @ts.notify(nil, {"message"=>String, "name"=>String}, 5)
notify2 = @ts.notify(nil, [:ans, Integer], 8)
notify3 = @ts.notify(nil, {"message"=>String, "name"=>String}, 8)
@ts.write({"message"=>"first", "name"=>"3"}, 3)
@ts.write({"message"=>"second", "name"=>"1"}, 1)
@ -347,18 +347,18 @@ module TupleSpaceTestModule
result = nil
lv = 0
n = 0
notify2.each do |ev|
notify2.each do |ev, tuple|
n += 1
if ev[0] == 'write'
if ev == 'write'
lv = lv + 1
elsif ev[0] == 'take'
elsif ev == 'take'
lv = lv - 1
elsif ev[0] == 'close'
elsif ev == 'close'
result = [lv, n]
break
end
assert(lv >= 0)
assert_equal([:ans, 10], ev[1])
assert_equal([:ans, 10], tuple)
end
result
end
@ -385,13 +385,15 @@ module TupleSpaceTestModule
sleep(4)
assert_equal(10, thread_join(taker))
# notify2 must not expire until this @ts.take.
# sleep(4) might be short enough for the timeout of notify2 (8 secs)
tuple = @ts.take([:ans, nil])
assert_equal(10, tuple[1])
assert_equal([], @ts.read_all([nil, nil]))
notify1.cancel
sleep(3) # notify2 expired
sleep(7) # notify2 expired (sleep(4)+sleep(7) > 8)
assert_equal([0, 11], thread_join(listener1))
assert_equal([0, 3], thread_join(listener2))