diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-15 14:51:48 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-15 14:51:48 +0000 |
commit | ba3bb2895f6f8bc95cf2c12d157fcac0779c7f05 (patch) | |
tree | 6fa2e2c78f79c18379341a8dd4e887a817031b2c | |
parent | 0481de5db50d8078dc9a5995530815a72024e43a (diff) | |
download | ruby-ba3bb2895f6f8bc95cf2c12d157fcac0779c7f05.tar.gz |
* test/xmlrpc/webrick_testing.rb: join webrick server thread.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | test/xmlrpc/webrick_testing.rb | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sat Dec 15 23:50:31 2007 Tanaka Akira <akr@fsij.org> + + * test/xmlrpc/webrick_testing.rb: join webrick server thread. + Sat Dec 15 22:27:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (BUILTIN_ENCS): splitted command line instead of diff --git a/test/xmlrpc/webrick_testing.rb b/test/xmlrpc/webrick_testing.rb index eb054a77e7..2ca52bad22 100644 --- a/test/xmlrpc/webrick_testing.rb +++ b/test/xmlrpc/webrick_testing.rb @@ -10,7 +10,7 @@ module WEBrick_Testing raise "already started" if @__server @__started = false - Thread.new { + @__server_thread = Thread.new { @__server = WEBrick::HTTPServer.new( { :Logger => DummyLog.new, @@ -32,6 +32,7 @@ module WEBrick_Testing @__server.shutdown Thread.pass while @__started # wait until the server is down } + @__server_thread.join @__server = nil end end |