summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-21 19:28:14 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-21 19:28:14 +0000
commit0e84f98d0de13a644469fbb145ecccc1b25d62df (patch)
tree646b9ca27eb36b5f4841322b3f4efea89f871682
parent4dcdbb4afcd99ce20dc7fd46dc712cf7ff25a36e (diff)
* 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/trunk@51916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/drb/test_drb.rb2
-rw-r--r--test/rinda/test_rinda.rb8
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7cf59c50b8..0783a04b8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 22 04:20:01 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
+
Mon Sep 21 20:53:39 2015 tbpgr <tbpgr@tbpgr.jp>
* test/win32ole/test_win32ole_event.rb: fix typo.
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 8f78ca9f4f..e0b92e690c 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