aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-12-13 14:35:11 +0900
committeraycabta <aycabta@gmail.com>2019-12-14 00:39:53 +0900
commit84b873e381c6928965e36d0a83c899a01b65e646 (patch)
tree8b06d4f1a1681b5a88aae220b9ad2511ec2ee559 /test
parentab1f3d63b0b08fcb8e90557a0d8d72e624221557 (diff)
downloadruby-84b873e381c6928965e36d0a83c899a01b65e646.tar.gz
[ruby/irb] Restore environment variables
https://github.com/ruby/irb/commit/236590882c
Diffstat (limited to 'test')
-rw-r--r--test/irb/test_init.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/test/irb/test_init.rb b/test/irb/test_init.rb
index 94b32ddb32..b51d01096d 100644
--- a/test/irb/test_init.rb
+++ b/test/irb/test_init.rb
@@ -20,9 +20,9 @@ module TestIRB
end
def test_rc_file
- ENV.delete("IRBRC") # This is for RVM...
+ backup_irbrc = ENV.delete("IRBRC") # This is for RVM...
+ backup_home = ENV["HOME"]
Dir.mktmpdir("test_irb_init_#{$$}") do |tmpdir|
- backup_home = ENV["HOME"]
ENV["HOME"] = tmpdir
IRB.conf[:RC_NAME_GENERATOR] = nil
@@ -32,15 +32,16 @@ module TestIRB
FileUtils.touch(tmpdir+"/.irb#{IRB::IRBRC_EXT}")
assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
-
- ENV["HOME"] = backup_home
end
+ ensure
+ ENV["HOME"] = backup_home
+ ENV["IRBRC"] = backup_irbrc
end
def test_rc_file_in_subdir
- ENV.delete("IRBRC") # This is for RVM...
+ backup_irbrc = ENV.delete("IRBRC") # This is for RVM...
+ backup_home = ENV["HOME"]
Dir.mktmpdir("test_irb_init_#{$$}") do |tmpdir|
- backup_home = ENV["HOME"]
ENV["HOME"] = tmpdir
FileUtils.mkdir_p("#{tmpdir}/mydir")
@@ -53,9 +54,10 @@ module TestIRB
assert_equal(tmpdir+"/.irb#{IRB::IRBRC_EXT}", IRB.rc_file)
assert_equal(tmpdir+"/.irb_history", IRB.rc_file("_history"))
end
-
- ENV["HOME"] = backup_home
end
+ ensure
+ ENV["HOME"] = backup_home
+ ENV["IRBRC"] = backup_irbrc
end
private