* test/rdoc/test_rdoc_info_formatting.rb (setup, teadown): uses

  mktmpdir and removes it alfter the test.

* test/cgi/test_cgi_session.rb (setup, teadown): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 4 deletions

diff --git a/test/cgi/test_cgi_session.rb b/test/cgi/test_cgi_session.rb
index 4fcb936d4..6cccb2224 100644
--- a/test/cgi/test_cgi_session.rb
+++ b/test/cgi/test_cgi_session.rb
@@ -7,14 +7,14 @@ require 'tmpdir'
 
 class CGISessionTest < Test::Unit::TestCase
   def setup
-    @session_dir = Dir.tmpdir+'/__test_dir__/session_dir/'
+    @session_dir = File.join(Dir.mktmpdir('__test_dir__'), 'session_dir')
     FileUtils.mkdir_p @session_dir
   end
 
   def teardown
     @environ.each do |key, val| ENV.delete(key) end
     $stdout = STDOUT
-    FileUtils.rm_rf(@session_dir)
+    FileUtils.rm_rf(File.dirname(@session_dir))
   end
 
   def test_cgi_session_filestore
diff --git a/test/rdoc/test_rdoc_info_formatting.rb b/test/rdoc/test_rdoc_info_formatting.rb
index 87147fb7c..c10532aa1 100644
--- a/test/rdoc/test_rdoc_info_formatting.rb
+++ b/test/rdoc/test_rdoc_info_formatting.rb
@@ -8,7 +8,7 @@ require 'rdoc/generator/texinfo'
 # From chapter 18 of the Pickaxe 3rd ed. and the TexInfo manual.
 class TestRDocInfoFormatting < MiniTest::Unit::TestCase
   def setup
-    @output_dir = File.join Dir.tmpdir, "test_rdoc_info_formatting_#{$$}"
+    @output_dir = File.join Dir.mktmpdir("test_rdoc_"), "info_formatting"
     @output_file = File.join @output_dir, 'rdoc.texinfo'
 
     RDoc::RDoc.new.document(['--fmt=texinfo', '--quiet',
@@ -20,7 +20,7 @@ class TestRDocInfoFormatting < MiniTest::Unit::TestCase
   end
 
   def teardown
-    # FileUtils.rm_rf @output_dir
+    FileUtils.rm_rf File.dirname(@output_dir)
   end
 
   # Make sure tags like *this* do not make HTML