aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-22 10:43:42 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-22 10:43:42 +0000
commit4e1ee66580ffbbfd420df2137e03c8be34f0962a (patch)
treeb9617db0a22c8039b1724daae23cc98d56717edc
parent0bd8193eba5139812c18f779ba5831b3c7df01d7 (diff)
downloadruby-4e1ee66580ffbbfd420df2137e03c8be34f0962a.tar.gz
Use File.expand_path("~username") instead of ENV["HOME"]
File.expand_path("~username") uses getpwnam() independently from Dir.home. [Bug #15324] From: Chris Seaton <chris@chrisseaton.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_dir.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 9ac56ec09d..fd8d455a0c 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -374,8 +374,7 @@ class TestDir < Test::Unit::TestCase
assert_equal(@nodir, Dir.home)
assert_equal(@nodir, Dir.home(""))
if user = ENV["USER"]
- ENV["HOME"] = env_home
- assert_equal(File.expand_path(env_home), Dir.home(user))
+ assert_equal(File.expand_path("~#{user}"), Dir.home(user))
end
}
%W[no:such:user \u{7559 5b88}:\u{756a}].each do |user|