From 05c29680e515c000552008f725747261ffa6008d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 Mar 2015 14:57:33 +0000 Subject: fix env leaks * lib/rubygems/test_case.rb (setup, teardown): fix environment variable change leaks. * test/cgi/update_env.rb: ditto. * test/rake/test_rake_application_options.rb (setup, teardown): ditto. * test/rake/test_rake_file_utils.rb (setup, teardown): ditto. * test/rubygems/test_gem_request.rb (setup): add https_proxy. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rake/test_rake_application_options.rb | 2 ++ test/rake/test_rake_file_utils.rb | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'test/rake') diff --git a/test/rake/test_rake_application_options.rb b/test/rake/test_rake_application_options.rb index 1914240590..250302685d 100644 --- a/test/rake/test_rake_application_options.rb +++ b/test/rake/test_rake_application_options.rb @@ -7,6 +7,7 @@ class TestRakeApplicationOptions < Rake::TestCase def setup super + @testkey = ENV['TESTKEY'] clear_argv Rake::FileUtilsExt.verbose_flag = false Rake::FileUtilsExt.nowrite_flag = false @@ -14,6 +15,7 @@ class TestRakeApplicationOptions < Rake::TestCase end def teardown + ENV['TESTKEY'] = @testkey clear_argv Rake::FileUtilsExt.verbose_flag = false Rake::FileUtilsExt.nowrite_flag = false diff --git a/test/rake/test_rake_file_utils.rb b/test/rake/test_rake_file_utils.rb index 37d33dc39a..90e01dfbf8 100644 --- a/test/rake/test_rake_file_utils.rb +++ b/test/rake/test_rake_file_utils.rb @@ -3,10 +3,15 @@ require 'fileutils' require 'stringio' class TestRakeFileUtils < Rake::TestCase + def setup + super + @rake_test_sh = ENV['RAKE_TEST_SH'] + end def teardown FileUtils::LN_SUPPORTED[0] = true RakeFileUtils.verbose_flag = Rake::FileUtilsExt::DEFAULT + ENV['RAKE_TEST_SH'] = @rake_test_sh super end -- cgit v1.2.3