kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* test/net/http/test_https_proxy.rb: Use assert_join_threads.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-11-11 13:08:01 +00:00
parent 50ad0f58bb
commit 7bb546a2a1
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Nov 11 22:07:20 2014 Tanaka Akira <akr@fsij.org>
* test/net/http/test_https_proxy.rb: Use assert_join_threads.
Tue Nov 11 18:09:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* template/prelude.c.tmpl: move from tool/compile_prelude.rb and

13
test/net/http/test_https_proxy.rb
View file

@ -12,10 +12,9 @@ class HTTPSProxyTest < Test::Unit::TestCase
skip 'autoload problem. see [ruby-dev:45021][Bug #5786]'
end
t = nil
TCPServer.open("127.0.0.1", 0) {|serv|
_, port, _, _ = serv.addr
t = Thread.new {
client_thread = Thread.new {
proxy = Net::HTTP.Proxy("127.0.0.1", port, 'user', 'password')
http = proxy.new("foo.example.org", 8000)
http.use_ssl = true
@ -25,7 +24,9 @@ class HTTPSProxyTest < Test::Unit::TestCase
rescue EOFError
end
}
server_thread = Thread.new {
sock = serv.accept
begin
proxy_request = sock.gets("\r\n\r\n")
assert_equal(
"CONNECT foo.example.org:8000 HTTP/1.1\r\n" +
@ -34,10 +35,12 @@ class HTTPSProxyTest < Test::Unit::TestCase
"\r\n",
proxy_request,
"[ruby-dev:25673]")
sock.close
}
ensure
t.join if t
sock.close
end
}
assert_join_threads([client_thread, server_thread])
}
end
end if defined?(OpenSSL)