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_gem_remote_fetcher.rb: restore environment variables

Browse source 
* test/rubygems/test_gem_remote_fetcher.rb (setup, teardown): always
  restore environment variables fo http proxy, to get rid of sporadic
  warnings from URI::Generic#find_proxy.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-12-15 07:29:43 +00:00
parent 43f791624a
commit 985fe77356
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/rubygems/test_gem_remote_fetcher.rb
View file

@ -78,18 +78,14 @@ gems:
DIR = File.expand_path(File.dirname(__FILE__)) DIR = File.expand_path(File.dirname(__FILE__))
def setup def setup
@proxies = %w[http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
@old_proxies = @proxies.map {|k| ENV[k] }
@proxies.each {|k| ENV[k] = nil }
super super
self.class.start_servers self.class.start_servers
self.class.enable_yaml = true self.class.enable_yaml = true
self.class.enable_zip = false self.class.enable_zip = false
ENV.delete 'http_proxy'
ENV.delete 'HTTP_PROXY'
ENV.delete 'http_proxy_user'
ENV.delete 'HTTP_PROXY_USER'
ENV.delete 'http_proxy_pass'
ENV.delete 'HTTP_PROXY_PASS'
ENV.delete 'no_proxy'
ENV.delete 'NO_PROXY'
base_server_uri = "http://localhost:#{SERVER_PORT}" base_server_uri = "http://localhost:#{SERVER_PORT}"
@proxy_uri = "http://localhost:#{PROXY_PORT}" @proxy_uri = "http://localhost:#{PROXY_PORT}"
@ -114,6 +110,7 @@ gems:
def teardown def teardown
super super
Gem.configuration[:http_proxy] = nil Gem.configuration[:http_proxy] = nil
@proxies.each_with_index {|k, i| ENV[k] = @old_proxies[i] }
end end
def test_self_fetcher def test_self_fetcher
@ -571,21 +568,12 @@ gems:
end end
def test_get_proxy_from_env_empty def test_get_proxy_from_env_empty
orig_env_HTTP_PROXY = ENV['HTTP_PROXY']
orig_env_http_proxy = ENV['http_proxy']
ENV['HTTP_PROXY'] = '' ENV['HTTP_PROXY'] = ''
ENV.delete 'http_proxy' ENV.delete 'http_proxy'
fetcher = Gem::RemoteFetcher.new nil fetcher = Gem::RemoteFetcher.new nil
assert_equal nil, fetcher.send(:get_proxy_from_env) assert_equal nil, fetcher.send(:get_proxy_from_env)
ensure
orig_env_HTTP_PROXY.nil? ? ENV.delete('HTTP_PROXY') :
ENV['HTTP_PROXY'] = orig_env_HTTP_PROXY
orig_env_http_proxy.nil? ? ENV.delete('http_proxy') :
ENV['http_proxy'] = orig_env_http_proxy
end end
def test_implicit_no_proxy def test_implicit_no_proxy