use DRbService.ext_service. reduce sleep

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

4 files changed, 8 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 48c402cec..30030c3f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan  4 21:25:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use 
+	  DRbService.ext_service. reduce sleep.
+
 Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
 
 	* random.c (random_seed): don't use /dev/urandom if it is not
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index eb1fa35cb..cfb3bc36a 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 eeaa9c93e..e1a17edd3 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 b0d3a5be9..93ac1d83f 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