summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/psych/test_yamlstore.rb12
-rw-r--r--test/syck/test_yamlstore.rb12
3 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d05756f2f..f762adf5b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 28 04:41:35 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+
+ * test/psych/test_yamlstore.rb: use tmpdir for tmpfile.
+ * test/syck/test_yamlstore.rb: ditto.
+
Wed Sep 28 04:10:46 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* ext/bigdecimal/README: update report to.
diff --git a/test/psych/test_yamlstore.rb b/test/psych/test_yamlstore.rb
index e99ba30dab..d607013ada 100644
--- a/test/psych/test_yamlstore.rb
+++ b/test/psych/test_yamlstore.rb
@@ -1,18 +1,26 @@
require 'test/unit'
require 'yaml/store'
+require 'tmpdir'
+
Psych::Store = YAML::Store unless defined?(Psych::Store)
module Psych
class YAMLStoreTest < Test::Unit::TestCase
def setup
@engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
- @yamlstore_file = "yamlstore.tmp.#{Process.pid}"
+ @dir = Dir.mktmpdir("rubytest-file")
+ File.chown(-1, Process.gid, @dir)
+ @yamlstore_file = make_tmp_filename("yamlstore")
@yamlstore = YAML::Store.new(@yamlstore_file)
end
def teardown
YAML::ENGINE.yamler = @engine
- File.unlink(@yamlstore_file) rescue nil
+ FileUtils.remove_entry_secure @dir
+ end
+
+ def make_tmp_filename(prefix)
+ @dir + "/" + prefix + File.basename(__FILE__) + ".#{$$}.test"
end
def test_opening_new_file_in_readonly_mode_should_result_in_empty_values
diff --git a/test/syck/test_yamlstore.rb b/test/syck/test_yamlstore.rb
index 8a52c00828..e87162594c 100644
--- a/test/syck/test_yamlstore.rb
+++ b/test/syck/test_yamlstore.rb
@@ -1,18 +1,26 @@
require 'test/unit'
require 'yaml/store'
+require 'tmpdir'
+
Syck::Store = YAML::Store unless defined?(Syck::Store)
module Syck
class YAMLStoreTest < Test::Unit::TestCase
def setup
@engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'syck'
- @yamlstore_file = "yamlstore.tmp.#{Process.pid}"
+ @dir = Dir.mktmpdir("rubytest-file")
+ File.chown(-1, Process.gid, @dir)
+ @yamlstore_file = make_tmp_filename("yamlstore")
@yamlstore = YAML::Store.new(@yamlstore_file)
end
def teardown
YAML::ENGINE.yamler = @engine
- File.unlink(@yamlstore_file) rescue nil
+ FileUtils.remove_entry_secure @dir
+ end
+
+ def make_tmp_filename(prefix)
+ @dir + "/" + prefix + File.basename(__FILE__) + ".#{$$}.test"
end
def test_opening_new_file_in_readonly_mode_should_result_in_empty_values