nagachika	2015-10-27 23:34:18 +0900 (Tue, 27 Oct 2015)

  New Revision: 52305

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52305

  Log:
    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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/drb/test_drb.rb
    branches/ruby_2_2/test/rinda/test_rinda.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52304)
+++ ruby_2_2/ChangeLog	(revision 52305)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Oct 27 23:32:51 2015  Masatoshi SEKI  <m_seki@m...>
+
+	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
+	  patch by voxik.
+
+	* test/rinda/test_rinda.rb: ditto
+
 Tue Oct  6 01:29:02 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (IS_BEG): include labeled argument state, which was
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52304)
+++ ruby_2_2/version.h	(revision 52305)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-10-06"
-#define RUBY_PATCHLEVEL 180
+#define RUBY_RELEASE_DATE "2015-10-27"
+#define RUBY_PATCHLEVEL 181
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/rinda/test_rinda.rb
===================================================================
--- ruby_2_2/test/rinda/test_rinda.rb	(revision 52304)
+++ ruby_2_2/test/rinda/test_rinda.rb	(revision 52305)
@@ -488,7 +488,7 @@ class TupleSpaceProxyTest < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rinda/test_rinda.rb#L488
   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:: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rinda/test_rinda.rb#L496
 
     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:: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rinda/test_rinda.rb#L512
 
     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:: https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rinda/test_rinda.rb#L531
     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
Index: ruby_2_2/test/drb/test_drb.rb
===================================================================
--- ruby_2_2/test/drb/test_drb.rb	(revision 52304)
+++ ruby_2_2/test/drb/test_drb.rb	(revision 52305)
@@ -211,7 +211,7 @@ class TestDRbMServer < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/drb/test_drb.rb#L211
     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
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51916


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/