merge revision(s) 35591: [Backport #7317]

	test: why believe source directories are writable always?

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 15 deletions

diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index 0736314b1a..8fc02f8899 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -21,13 +21,6 @@ class TestLogger < Test::Unit::TestCase
 
   def setup
     @logger = Logger.new(nil)
-    @filename = __FILE__ + ".#{$$}"
-  end
-
-  def teardown
-    unless $DEBUG
-      File.unlink(@filename) if File.exist?(@filename)
-    end
   end
 
   class Log
@@ -279,13 +272,14 @@ class TestLogDevice < Test::Unit::TestCase
   end
 
   def setup
-    @filename = __FILE__ + ".#{$$}"
+    @tempfile = Tempfile.new("logger")
+    @tempfile.close
+    @filename = @tempfile.path
+    File.unlink(@filename)
   end
 
   def teardown
-    unless $DEBUG
-      File.unlink(@filename) if File.exist?(@filename)
-    end
+    @tempfile.close(true)
   end
 
   def d(log, opt = {})
@@ -480,13 +474,14 @@ end
 class TestLoggerApplication < Test::Unit::TestCase
   def setup
     @app = Logger::Application.new('appname')
-    @filename = __FILE__ + ".#{$$}"
+    @tempfile = Tempfile.new("logger")
+    @tempfile.close
+    @filename = @tempfile.path
+    File.unlink(@filename)
   end
 
   def teardown
-    unless $DEBUG
-      File.unlink(@filename) if File.exist?(@filename)
-    end
+    @tempfile.close(true)
   end
 
   def test_initialize