* test/xmlrpc: Use assert_join_threads.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 12 deletions

diff --git a/test/xmlrpc/test_cookie.rb b/test/xmlrpc/test_cookie.rb
index 4f5e17a1b5..cfcfe4c3f0 100644
--- a/test/xmlrpc/test_cookie.rb
+++ b/test/xmlrpc/test_cookie.rb
@@ -66,22 +66,20 @@ class TestCookie < Test::Unit::TestCase
     s
   end
 
-  def setup_http_server
+  def setup_http_server_option
     option = {:Port => 0}
-
-    addr = start_server(option) {|w| w.mount('/RPC2', create_servlet) }
-
-    @s = XMLRPC::Client.new3(:host => addr.ip_address, :port => addr.ip_port)
   end
 
   def test_cookie
-    begin
-      setup_http_server
-      do_test
-    ensure
-      @s.http.finish
-      stop_server
-    end
+    option = setup_http_server_option
+    with_server(option, create_servlet) {|addr|
+      begin
+        @s = XMLRPC::Client.new3(:host => addr.ip_address, :port => addr.ip_port)
+        do_test
+      ensure
+        @s.http.finish
+      end
+    }
   end
 
   def do_test