aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rinda/test_rinda.rb4
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b44c9e788d..975b0fb3d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 24 04:13:27 2013 Eric Hodel <drbrain@segment7.net>
+
+ * test/rinda/test_rinda.rb: Fixed test failures in r39890 and r39890
+ due to stopping DRb service.
+
Sun Mar 24 03:34:02 2013 Eric Hodel <drbrain@segment7.net>
* lib/rinda/rinda.rb: Fixed loss of tuple when remote is alive but the
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 13f5d6d2bb..59b769c6e9 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -478,13 +478,11 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
end
def test_take_bug_8215
- DRb.stop_service
service = DRb.start_service(nil, @ts_base)
uri = service.uri
take = fork do
- DRb.stop_service
DRb.start_service
ro = DRbObject.new_with_uri(uri)
ts = Rinda::TupleSpaceProxy.new(ro)
@@ -500,7 +498,6 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
@ts_base.take([:barrier, :continue])
write = fork do
- DRb.stop_service
DRb.start_service
ro = DRbObject.new_with_uri(uri)
ts = Rinda::TupleSpaceProxy.new(ro)
@@ -514,7 +511,6 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
ensure
Process.kill("TERM", write) if write && status.nil?
Process.kill("TERM", take) if take
- service.stop_service
end
@server = DRb.primary_server || DRb.start_service