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

fix failures

Browse source 
* test/uri/test_generic.rb (URI#with_env): unset proxy related env
  variables.  [Bug #6774]

* test/uri/test_generic.rb (URI#test_find_proxy): fix failures
  when proxy related env variables already set.  [Bug #6774]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kazu 2012-07-22 16:50:49 +00:00
parent 4ed06c9cb7
commit 89a030795a
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Jul 23 01:47:26 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/uri/test_generic.rb (URI#with_env): unset proxy related env
variables. [Bug #6774]
* test/uri/test_generic.rb (URI#test_find_proxy): fix failures
when proxy related env variables already set. [Bug #6774]
Sun Jul 22 23:58:48 2012 NARUSE, Yui <naruse@ruby-lang.org> Sun Jul 22 23:58:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
* thread.c (rb_threadptr_execute_interrupts_common): increase * thread.c (rb_threadptr_execute_interrupts_common): increase

11
test/uri/test_generic.rb
View file

@ -736,8 +736,10 @@ class URI::TestGeneric < Test::Unit::TestCase
# 192.0.2.0/24 is TEST-NET. [RFC3330] # 192.0.2.0/24 is TEST-NET. [RFC3330]
def test_find_proxy def test_find_proxy
assert_nil(URI("http://192.0.2.1/").find_proxy) with_env({}) {
assert_nil(URI("ftp://192.0.2.1/").find_proxy) assert_nil(URI("http://192.0.2.1/").find_proxy)
assert_nil(URI("ftp://192.0.2.1/").find_proxy)
}
with_env('http_proxy'=>'http://127.0.0.1:8080') { with_env('http_proxy'=>'http://127.0.0.1:8080') {
assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy) assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy)
assert_nil(URI("ftp://192.0.2.1/").find_proxy) assert_nil(URI("ftp://192.0.2.1/").find_proxy)
@ -771,6 +773,11 @@ class URI::TestGeneric < Test::Unit::TestCase
end unless RUBY_PLATFORM =~ /mswin|mingw/ end unless RUBY_PLATFORM =~ /mswin|mingw/
def with_env(h) def with_env(h)
['http', 'https', 'ftp'].each do |scheme|
name = "#{scheme}_proxy"
h[name] ||= nil
h["CGI_#{name.upcase}"] ||= nil
end
begin begin
old = {} old = {}
h.each_key {|k| old[k] = ENV[k] } h.each_key {|k| old[k] = ENV[k] }