kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
* 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
This commit is contained in:
nagachika 2015-10-27 14:34:18 +00:00
parent df51beda2f
commit edb7a6e239
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Tue Oct 27 23:32:51 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 Oct 6 01:29:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (IS_BEG): include labeled argument state, which was

2
test/drb/test_drb.rb
View file

@ -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

8
test/rinda/test_rinda.rb
View file

@ -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

6
version.h
View file

@ -1,10 +1,10 @@
#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"