merge revision(s) 51916: [Backport #11543]

	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
	  patch by voxik.

	* test/rinda/test_rinda.rb: ditto


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

2 files changed, 5 insertions, 5 deletions

diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index ffc2935edc..016e62f7c6 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -211,7 +211,7 @@ class TestDRbMServer < Test::Unit::TestCase
     setup_service 'ut_drb.rb'
     super
     @server = (1..3).collect do |n|
-      DRb::DRbServer.new(nil, Onecky.new(n.to_s))
+      DRb::DRbServer.new("druby://localhost:0", Onecky.new(n.to_s))
     end
   end
 
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 812b437ead..b940cee395 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -488,7 +488,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
   end
 
   def test_take_bug_8215
-    service = DRb.start_service(nil, @ts_base)
+    service = DRb.start_service("druby://localhost:0", @ts_base)
 
     uri = service.uri
 
@@ -496,7 +496,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
 
     take = spawn(*args, <<-'end;', uri)
       uri = ARGV[0]
-      DRb.start_service
+      DRb.start_service("druby://localhost:0")
       ro = DRbObject.new_with_uri(uri)
       ts = Rinda::TupleSpaceProxy.new(ro)
       th = Thread.new do
@@ -512,7 +512,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
 
     write = spawn(*args, <<-'end;', uri)
       uri = ARGV[0]
-      DRb.start_service
+      DRb.start_service("druby://localhost:0")
       ro = DRbObject.new_with_uri(uri)
       ts = Rinda::TupleSpaceProxy.new(ro)
       ts.write([:test_take, 42])
@@ -531,7 +531,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
     Process.wait(take)  if take
   end
 
-  @server = DRb.primary_server || DRb.start_service
+  @server = DRb.primary_server || DRb.start_service("druby://localhost:0")
 end
 
 module RingIPv6