ruby-changes:61955
From: Takashi <ko1@a...>
Date: Sat, 27 Jun 2020 14:44:35 +0900 (JST)
Subject: [ruby-changes:61955] 609ac6ee2c (master): Revert "Try increasing read timeout of rinda tests"
https://git.ruby-lang.org/ruby.git/commit/?id=609ac6ee2c From 609ac6ee2c30ec8d91f3a97648565cf0bcaa3b0d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Fri, 26 Jun 2020 22:41:38 -0700 Subject: Revert "Try increasing read timeout of rinda tests" This reverts commit 5c03e4680e724faeedb2c5fc1581d5fcb66aaff2. 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 diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index 2f441cc..14fc7ef 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -382,7 +382,7 @@ module TupleSpaceTestModule https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L382 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 https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L402 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 https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L411 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 https://github.com/ruby/ruby/blob/trunk/test/rinda/test_rinda.rb#L470 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 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/