diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-19 07:47:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-19 07:47:38 +0000 |
commit | b0f623f5f418fed481c3634b6a3d1a0f508c888d (patch) | |
tree | 8b6bc44fce4c5a00859358aba9e630088a552e16 /test/drb/test_drb.rb | |
parent | 226fcd5814a2aea4ee5de9abcf2db972684e9d5e (diff) | |
download | ruby-b0f623f5f418fed481c3634b6a3d1a0f508c888d.tar.gz |
drbtest.rb: DRbBase
* test/drb/drbtest.rb (DRbBase): extract from DRbCore and DRbAry for
setup_service and teardown.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/drb/test_drb.rb')
-rw-r--r-- | test/drb/test_drb.rb | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb index 5841687b38..573818558a 100644 --- a/test/drb/test_drb.rb +++ b/test/drb/test_drb.rb @@ -2,16 +2,19 @@ require_relative 'drbtest' class TestDRbCore < Test::Unit::TestCase include DRbCore -end -class TestDRbYield < Test::Unit::TestCase def setup - @ext = DRbService.ext_service('ut_drb.rb') - @there = @ext.front + setup_service 'ut_drb.rb' + super end +end - def teardown - @ext.stop_service if @ext +class TestDRbYield < Test::Unit::TestCase + include DRbBase + + def setup + setup_service 'ut_drb.rb' + super end def test_01_one @@ -177,12 +180,19 @@ end class TestDRbAry < Test::Unit::TestCase include DRbAry + + def setup + setup_service 'ut_array.rb' + super + end end class TestDRbMServer < Test::Unit::TestCase + include DRbBase + def setup - @ext = DRbService.ext_service('ut_drb.rb') - @there = @ext.front + setup_service 'ut_drb.rb' + super @server = (1..3).collect do |n| DRb::DRbServer.new(nil, Onecky.new(n.to_s)) end @@ -192,7 +202,7 @@ class TestDRbMServer < Test::Unit::TestCase @server.each do |s| s.stop_service end - @ext.stop_service if @ext + super end def test_01 @@ -202,9 +212,7 @@ end class TestDRbSafe1 < TestDRbAry def setup - @service_name = 'ut_safe1.rb' - @ext = DRbService.ext_service(@service_name) - @there = @ext.front + setup_service 'ut_safe1.rb' end end @@ -258,13 +266,11 @@ class TestDRbEval # < Test::Unit::TestCase end class TestDRbLarge < Test::Unit::TestCase - def setup - @ext = DRbService.ext_service('ut_large.rb') - @there = @ext.front - end + include DRbBase - def teardown - @ext.stop_service if @ext + def setup + setup_service 'ut_large.rb' + super end def test_01_large_ary @@ -302,13 +308,11 @@ class TestDRbLarge < Test::Unit::TestCase end class TestBug4409 < Test::Unit::TestCase - def setup - @ext = DRbService.ext_service('ut_eq.rb') - @there = @ext.front - end + include DRbBase - def teardown - @ext.stop_service if @ext + def setup + setup_service 'ut_eq.rb' + super end def test_bug4409 |