use DRbService.ext_service. reduce sleep

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 3 insertions, 26 deletions

diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index eb1fa35cbc..cfb3bc36a4 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -48,18 +48,6 @@ 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
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index eeaa9c93ef..e1a17edd3d 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -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
diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb
index b0d3a5be9a..93ac1d83fe 100644
--- a/test/drb/ut_drb.rb
+++ b/test/drb/ut_drb.rb
@@ -49,7 +49,7 @@ class DRbEx
   end
 
   def do_timeout(n)
-    timeout(1) do
+    timeout(0.1) do
       n.sleep(2)
     end
   end