Skip to content

Commit 414c00e

Browse files
committed
Test also TMP and TEMP environment variables
1 parent ac12877 commit 414c00e

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

test/test_tmpdir.rb

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,26 @@ def test_world_writable
1515
skip "no meaning on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
1616
Dir.mktmpdir do |tmpdir|
1717
# ToDo: fix for parallel test
18-
olddir, ENV["TMPDIR"] = ENV["TMPDIR"], tmpdir
18+
envs = %w[TMPDIR TMP TEMP]
19+
oldenv = envs.each_with_object({}) {|v, h| h[v] = ENV.delete(v)}
1920
begin
20-
assert_equal(tmpdir, Dir.tmpdir)
21-
File.chmod(0777, tmpdir)
22-
assert_not_equal(tmpdir, Dir.tmpdir)
23-
newdir = Dir.mktmpdir("d", tmpdir) do |dir|
24-
assert_file.directory? dir
25-
assert_equal(tmpdir, File.dirname(dir))
26-
dir
21+
envs.each do |e|
22+
ENV[e] = tmpdir
23+
assert_equal(tmpdir, Dir.tmpdir)
24+
File.chmod(0777, tmpdir)
25+
assert_not_equal(tmpdir, Dir.tmpdir)
26+
newdir = Dir.mktmpdir("d", tmpdir) do |dir|
27+
assert_file.directory? dir
28+
assert_equal(tmpdir, File.dirname(dir))
29+
dir
30+
end
31+
assert_file.not_exist?(newdir)
32+
File.chmod(01777, tmpdir)
33+
assert_equal(tmpdir, Dir.tmpdir)
34+
ENV[e] = nil
2735
end
28-
assert_file.not_exist?(newdir)
29-
File.chmod(01777, tmpdir)
30-
assert_equal(tmpdir, Dir.tmpdir)
3136
ensure
32-
ENV["TMPDIR"] = olddir
37+
ENV.update(oldenv)
3338
end
3439
end
3540
end

0 commit comments

Comments
 (0)