summaryrefslogtreecommitdiff
path: root/test/drb/drbtest.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-19 07:47:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-19 07:47:38 +0000
commitb0f623f5f418fed481c3634b6a3d1a0f508c888d (patch)
tree8b6bc44fce4c5a00859358aba9e630088a552e16 /test/drb/drbtest.rb
parent226fcd5814a2aea4ee5de9abcf2db972684e9d5e (diff)
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/drbtest.rb')
-rw-r--r--test/drb/drbtest.rb41
1 files changed, 8 insertions, 33 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 668a260825..8ca575089f 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -63,9 +63,9 @@ class XArray < Array
end
end
-module DRbCore
- def setup
- @service_name = 'ut_drb.rb'
+module DRbBase
+ def setup_service(service_name)
+ @service_name = service_name
@ext = DRbService.ext_service(@service_name)
@there = @ext.front
end
@@ -94,6 +94,10 @@ module DRbCore
end
}
end
+end
+
+module DRbCore
+ include DRbBase
def test_00_DRbObject
ro = DRbObject.new(nil, 'druby://localhost:12345')
@@ -288,36 +292,7 @@ module DRbCore
end
module DRbAry
- def setup
- @service_name = 'ut_array.rb'
- @ext = DRbService.ext_service(@service_name)
- @there = @ext.front
- end
-
- def teardown
- @ext.stop_service if defined?(@ext) && @ext
- DRbService.manager.unregist(@service_name)
- while (@there&&@there.to_s rescue nil)
- # nop
- end
- signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
- Thread.list.each {|th|
- if th.respond_to?(:pid) && th[:drb_service] == @service_name
- 10.times do
- begin
- Process.kill signal, th.pid
- break
- rescue Errno::ESRCH
- break
- rescue Errno::EPERM # on Windows
- sleep 0.1
- retry
- end
- end
- th.join
- end
- }
- end
+ include DRbBase
def test_01
assert_kind_of(DRb::DRbObject, @there)