summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-07 01:54:40 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-07 01:54:40 +0000
commitbb6a76f9999a851adb721c8f32a216c192557ac3 (patch)
treef708b96d78b602b6722eabbfe24dbb835ef29c83
parent38b57c2915035105c92fcc46bf212125ac421e48 (diff)
explicitly stop DRb::ExtServ
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/drb/ut_array.rb3
-rw-r--r--test/drb/ut_array_drbssl.rb3
-rw-r--r--test/drb/ut_array_drbunix.rb3
-rw-r--r--test/drb/ut_drb_drbssl.rb3
-rw-r--r--test/drb/ut_drb_drbunix.rb3
-rw-r--r--test/drb/ut_eq.rb3
-rw-r--r--test/drb/ut_eval.rb3
-rw-r--r--test/drb/ut_large.rb3
-rw-r--r--test/drb/ut_port.rb3
-rw-r--r--test/drb/ut_safe1.rb3
10 files changed, 20 insertions, 10 deletions
diff --git a/test/drb/ut_array.rb b/test/drb/ut_array.rb
index e9b0f1a2fac..01599f1d89e 100644
--- a/test/drb/ut_array.rb
+++ b/test/drb/ut_array.rb
@@ -9,7 +9,8 @@ if __FILE__ == $0
end
DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6])
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_array_drbssl.rb b/test/drb/ut_array_drbssl.rb
index 5ec30614e2d..a56695dcd1e 100644
--- a/test/drb/ut_array_drbssl.rb
+++ b/test/drb/ut_array_drbssl.rb
@@ -29,7 +29,8 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
[ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
DRb.start_service('drbssl://localhost:0', [1, 2, 'III', 4, "five", 6], config)
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_array_drbunix.rb b/test/drb/ut_array_drbunix.rb
index 114a79854de..dd397907c7d 100644
--- a/test/drb/ut_array_drbunix.rb
+++ b/test/drb/ut_array_drbunix.rb
@@ -9,7 +9,8 @@ if __FILE__ == $0
end
DRb.start_service('drbunix:', [1, 2, 'III', 4, "five", 6])
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_drb_drbssl.rb b/test/drb/ut_drb_drbssl.rb
index 098cb898124..1e270371d5d 100644
--- a/test/drb/ut_drb_drbssl.rb
+++ b/test/drb/ut_drb_drbssl.rb
@@ -30,7 +30,8 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
DRb::DRbServer.default_argc_limit(8)
DRb::DRbServer.default_load_limit(4096)
DRb.start_service('drbssl://localhost:0', DRbEx.new, config)
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_drb_drbunix.rb b/test/drb/ut_drb_drbunix.rb
index 0e54a6a41ca..83ae31e903e 100644
--- a/test/drb/ut_drb_drbunix.rb
+++ b/test/drb/ut_drb_drbunix.rb
@@ -10,7 +10,8 @@ if __FILE__ == $0
DRb::DRbServer.default_argc_limit(8)
DRb::DRbServer.default_load_limit(4096)
DRb.start_service('drbunix:', DRbEx.new)
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_eq.rb b/test/drb/ut_eq.rb
index db822db01ea..7a0e04126ce 100644
--- a/test/drb/ut_eq.rb
+++ b/test/drb/ut_eq.rb
@@ -25,6 +25,7 @@ if __FILE__ == $0
end
DRb.start_service('druby://localhost:0', Bar.new)
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_eval.rb b/test/drb/ut_eval.rb
index 8129f90897c..1dbf8a5c50f 100644
--- a/test/drb/ut_eval.rb
+++ b/test/drb/ut_eval.rb
@@ -26,6 +26,7 @@ if __FILE__ == $0
$SAFE = 1
DRb.start_service('druby://localhost:0', EvalAttack.new, {:safe_level => 2})
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_large.rb b/test/drb/ut_large.rb
index a8994bc44e4..ab36c1b4a88 100644
--- a/test/drb/ut_large.rb
+++ b/test/drb/ut_large.rb
@@ -32,7 +32,8 @@ if __FILE__ == $0
DRb::DRbServer.default_argc_limit(3)
DRb::DRbServer.default_load_limit(100000)
DRb.start_service('druby://localhost:0', DRbLarge.new)
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_port.rb b/test/drb/ut_port.rb
index 029960c5f86..3009db5acdd 100644
--- a/test/drb/ut_port.rb
+++ b/test/drb/ut_port.rb
@@ -9,6 +9,7 @@ if __FILE__ == $0
end
DRb.start_service('druby://:8473', [1, 2, 'III', 4, "five", 6])
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end
diff --git a/test/drb/ut_safe1.rb b/test/drb/ut_safe1.rb
index 5caea2900e7..43eb367689d 100644
--- a/test/drb/ut_safe1.rb
+++ b/test/drb/ut_safe1.rb
@@ -10,6 +10,7 @@ if __FILE__ == $0
DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6],
{:safe_level => 1})
- DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+ es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
+ es.stop_service if es.alive?
end