From b0f623f5f418fed481c3634b6a3d1a0f508c888d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 19 Jun 2013 07:47:38 +0000
Subject: 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
---
 test/drb/drbtest.rb | 41 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

(limited to 'test/drb/drbtest.rb')

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)
-- 
cgit v1.2.3