summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-08 06:49:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-08 06:49:59 +0000
commita0d2cd2e1eee9765b14506360d51d6b1e2f23b58 (patch)
tree61aea62ba0689a068ffd60e184b0777af49401cc
parent965121cdc5675d6d6f3ed356210eb447e87f7b4d (diff)
test: why believe source directories are writable always?
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/cgi/test_cgi_session.rb3
-rwxr-xr-xtest/csv/test_features.rb12
-rwxr-xr-xtest/csv/test_interface.rb9
-rwxr-xr-xtest/csv/test_serialization.rb6
-rw-r--r--test/logger/test_logger.rb25
5 files changed, 29 insertions, 26 deletions
diff --git a/test/cgi/test_cgi_session.rb b/test/cgi/test_cgi_session.rb
index f3b8e60865e..7fa7ad7acd9 100644
--- a/test/cgi/test_cgi_session.rb
+++ b/test/cgi/test_cgi_session.rb
@@ -7,8 +7,7 @@ require 'tmpdir'
class CGISessionTest < Test::Unit::TestCase
def setup
- @session_dir = File.join(File.dirname(__FILE__), 'session_dir')
- FileUtils.mkdir_p @session_dir
+ @session_dir = Dir.mktmpdir(%w'session dir')
end
def teardown
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index 0da557e6e1b..33166e8d777 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -208,7 +208,9 @@ class TestCSV::Features < TestCSV
end
def test_gzip_writer_bug_fix
- file = File.join(File.dirname(__FILE__), "temp.gz")
+ tempfile = Tempfile.new(%w"temp .gz")
+ tempfile.close
+ file = tempfile.path
zipped = nil
assert_nothing_raised(NoMethodError) do
zipped = CSV.new(Zlib::GzipWriter.open(file))
@@ -220,7 +222,7 @@ class TestCSV::Features < TestCSV
assert( Zlib::GzipReader.open(file) { |f| f.read }.
include?($INPUT_RECORD_SEPARATOR),
"@row_sep did not default" )
- File.unlink(file)
+ tempfile.close(true)
end
def test_inspect_is_smart_about_io_types
@@ -230,11 +232,13 @@ class TestCSV::Features < TestCSV
str = CSV.new($stderr).inspect
assert(str.include?("io_type:$stderr"), "IO type not detected.")
- path = File.join(File.dirname(__FILE__), "temp.csv")
+ tempfile = Tempfile.new(%w"temp .csv")
+ tempfile.close
+ path = tempfile.path
File.open(path, "w") { |csv| csv << "one,two,three\n1,2,3\n" }
str = CSV.open(path) { |csv| csv.inspect }
assert(str.include?("io_type:File"), "IO type not detected.")
- File.unlink(path)
+ tempfile.close(true)
end
def test_inspect_shows_key_attributes
diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb
index 9cdbcec4510..73e6ca9a4ad 100755
--- a/test/csv/test_interface.rb
+++ b/test/csv/test_interface.rb
@@ -8,13 +8,16 @@
# under the terms of Ruby's license.
require_relative "base"
+require "tempfile"
class TestCSV::Interface < TestCSV
extend DifferentOFS
def setup
super
- @path = File.join(File.dirname(__FILE__), "temp_test_data.csv")
+ @tempfile = Tempfile.new(%w"temp .csv")
+ @tempfile.close
+ @path = @tempfile.path
File.open(@path, "wb") do |file|
file << "1\t2\t3\r\n"
@@ -25,7 +28,7 @@ class TestCSV::Interface < TestCSV
end
def teardown
- File.unlink(@path)
+ @tempfile.close(true)
super
end
@@ -112,7 +115,7 @@ class TestCSV::Interface < TestCSV
assert_equal(nil, csv.shift)
end
end
-
+
def test_enumerators_are_supported
CSV.open(@path, col_sep: "\t", row_sep: "\r\n") do |csv|
enum = csv.each
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb
index ba19b7a3918..09440a426b1 100755
--- a/test/csv/test_serialization.rb
+++ b/test/csv/test_serialization.rb
@@ -131,7 +131,9 @@ class TestCSV::Serialization < TestCSV
def test_io
test_class_dump
- data_file = File.join(File.dirname(__FILE__), "serialization_test_data.csv")
+ tempfile = Tempfile.new(%w"serialization .csv")
+ tempfile.close
+ data_file = tempfile.path
CSV.dump(@names, File.open(data_file, "wb"))
assert(File.exist?(data_file))
@@ -145,7 +147,7 @@ class TestCSV::Serialization < TestCSV
assert_equal(@names, CSV.load(File.open(data_file)))
- File.unlink(data_file)
+ tempfile.close(true)
end
def test_custom_dump_and_load
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index 0736314b1ab..8fc02f8899a 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