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

remove TestDRbReusePort, resuce sleep, add DRbService.ext_service

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
seki 2005-02-16 15:10:17 +00:00
parent 880f2d7dea
commit ef46698d76
6 changed files with 39 additions and 49 deletions

View file

@ -1,3 +1,19 @@
Thu Feb 17 00:09:45 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
[ruby-dev:25238]
* test/drb/test_drb.rb: add method DRbService.ext_service, move
TestDRbReusePort to new file [ruby-dev:25238]
* test/drb/test_drb.rb: ditto.
* test/drb/test_drbssl.rb: ditto.
* test/drb/test_drbunix.rb: ditto.
* test/drb/ut_drb.rb: reduce sleep.
Thu Feb 17 00:02:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (is_defined): NODE_IASGN is an assignment.

View file

@ -26,6 +26,11 @@ class DRbService
def self.server
@server || @@server
end
def self.ext_service(name)
timeout(10, RuntimeError) do
manager.service(name)
end
end
end
class Onecky
@ -61,12 +66,12 @@ end
module DRbCore
def setup
@ext = DRbService.manager.service('ut_drb.rb')
@ext = DRbService.ext_service('ut_drb.rb')
@there = @ext.front
end
def teardown
@ext.stop_service
@ext.stop_service if @ext
end
def test_00_DRbObject
@ -244,12 +249,12 @@ end
module DRbAry
def setup
@ext = DRbService.manager.service('ut_array.rb')
@ext = DRbService.ext_service('ut_array.rb')
@there = @ext.front
end
def teardown
@ext.stop_service
@ext.stop_service if @ext
end
def test_01

View file

@ -6,12 +6,12 @@ end
class TestDRbYield < Test::Unit::TestCase
def setup
@ext = DRbService.manager.service('ut_drb.rb')
@ext = DRbService.ext_service('ut_drb.rb')
@there = @ext.front
end
def teardown
@ext.stop_service
@ext.stop_service if @ext
end
def test_01_one
@ -172,7 +172,7 @@ end
class TestDRbMServer < Test::Unit::TestCase
def setup
@ext = DRbService.manager.service('ut_drb.rb')
@ext = DRbService.ext_service('ut_drb.rb')
@there = @ext.front
@server = (1..3).collect do |n|
DRb::DRbServer.new(nil, Onecky.new(n.to_s))
@ -183,7 +183,7 @@ class TestDRbMServer < Test::Unit::TestCase
@server.each do |s|
s.stop_service
end
@ext.stop_service
@ext.stop_service if @ext
end
def test_01
@ -191,17 +191,9 @@ class TestDRbMServer < Test::Unit::TestCase
end
end
class TestDRbReusePort < TestDRbAry
def setup
sleep 1.2
@ext = DRbService.manager.service('ut_port.rb')
@there = @ext.front
end
end
class TestDRbSafe1 < TestDRbAry
def setup
@ext = DRbService.manager.service('ut_safe1.rb')
@ext = DRbService.ext_service('ut_safe1.rb')
@there = @ext.front
end
end
@ -209,12 +201,12 @@ end
class TestDRbEval < Test::Unit::TestCase
def setup
super
@ext = DRbService.manager.service('ut_eval.rb')
@ext = DRbService.ext_service('ut_eval.rb')
@there = @ext.front
end
def teardown
@ext.stop_service
@ext.stop_service if @ext
end
def test_01_safe1_safe4_eval
@ -257,12 +249,12 @@ end
class TestDRbLarge < Test::Unit::TestCase
def setup
@ext = DRbService.manager.service('ut_large.rb')
@ext = DRbService.ext_service('ut_large.rb')
@there = @ext.front
end
def teardown
@ext.stop_service
@ext.stop_service if @ext
end
def test_01_large_ary

View file

@ -36,7 +36,7 @@ end
class TestDRbSSLCore < Test::Unit::TestCase
include DRbCore
def setup
@ext = DRbSSLService.manager.service('ut_drb_drbssl.rb')
@ext = DRbSSLService.ext_service('ut_drb_drbssl.rb')
@there = @ext.front
end
@ -48,24 +48,12 @@ class TestDRbSSLCore < Test::Unit::TestCase
def test_05_eq
end
def test_06_timeout
ten = Onecky.new(3)
assert_raises(TimeoutError) do
@there.do_timeout(ten)
end
assert_raises(TimeoutError) do
@there.do_timeout(ten)
end
sleep 3
end
end
class TestDRbSSLAry < Test::Unit::TestCase
include DRbAry
def setup
@ext = DRbSSLService.manager.service('ut_array_drbssl.rb')
@ext = DRbSSLService.ext_service('ut_array_drbssl.rb')
@there = @ext.front
end
end

View file

@ -20,7 +20,7 @@ end
class TestDRbUNIXCore < Test::Unit::TestCase
include DRbCore
def setup
@ext = DRbUNIXService.manager.service('ut_drb_drbunix.rb')
@ext = DRbUNIXService.ext_service('ut_drb_drbunix.rb')
@there = @ext.front
end
@ -32,23 +32,12 @@ class TestDRbUNIXCore < Test::Unit::TestCase
def test_05_eq
end
def test_06_timeout
ten = Onecky.new(3)
assert_raises(TimeoutError) do
@there.do_timeout(ten)
end
assert_raises(TimeoutError) do
@there.do_timeout(ten)
end
sleep 3
end
end
class TestDRbUNIXAry < Test::Unit::TestCase
include DRbAry
def setup
@ext = DRbUNIXService.manager.service('ut_array_drbunix.rb')
@ext = DRbUNIXService.ext_service('ut_array_drbunix.rb')
@there = @ext.front
end
end

View file

@ -49,7 +49,7 @@ class DRbEx
end
def do_timeout(n)
timeout(1) do
timeout(0.1) do
n.sleep(2)
end
end