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_1@52353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 12a34909cb..155c834abd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 29 22:51:59 2015  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
+	  patch by voxik.
+
+	* test/rinda/test_rinda.rb: ditto
+
 Tue Sep 29 17:39:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index 573818558a..77fcaff3d4 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -194,7 +194,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 f5472d28ac..d79653c68c 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -480,7 +480,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
 
   def test_take_bug_8215
     require_relative '../ruby/envutil'
-    service = DRb.start_service(nil, @ts_base)
+    service = DRb.start_service("druby://localhost:0", @ts_base)
 
     uri = service.uri
 
@@ -488,7 +488,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
@@ -504,7 +504,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])
@@ -522,7 +522,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
diff --git a/version.h b/version.h
index 691761ea6d..9aaee54a40 100644
--- a/version.h
+++ b/version.h
@@ -1,9 +1,9 @@
 #define RUBY_VERSION "2.1.8"
-#define RUBY_RELEASE_DATE "2015-09-29"
-#define RUBY_PATCHLEVEL 405
+#define RUBY_RELEASE_DATE "2015-10-29"
+#define RUBY_PATCHLEVEL 406
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 9
+#define RUBY_RELEASE_MONTH 10
 #define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"