summaryrefslogtreecommitdiff
path: root/test/net
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-31 14:28:19 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-31 14:28:19 +0000
commite555e28eab97b7f086367b13c603cd44957c8776 (patch)
tree7b1fac80c603fba8260ee7e5adad69914c9f1f32 /test/net
parentf07096f7e19a425a68101dc5fd79bc58e3f42f67 (diff)
Join threads.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net')
-rw-r--r--test/net/http/utils.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index 7110a24..c629da8 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -34,9 +34,7 @@ module TestNetHTTPUtils
def teardown
if @server
@server.shutdown
- until @server.status == :Stop
- sleep 0.1
- end
+ @server_thread.join
end
# resume global state
Net::HTTP.version_1_2
@@ -63,7 +61,7 @@ module TestNetHTTPUtils
end
@server = WEBrick::HTTPServer.new(server_config)
@server.mount('/', Servlet, config('chunked'))
- @server.start
+ @server_thread = @server.start
@config['port'] = @server[:Port]
n_try_max = 5
begin