From 7eee7f1cde9012d4ad315fa4562eb63a8f7c7fb1 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Oct 2007 06:29:59 +0000
Subject: forgot to modify TestDBM2 and TestGDBM2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/dbm/test_dbm.rb | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'test/dbm/test_dbm.rb')

diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb
index bc48831cdb..159ab43f35 100644
--- a/test/dbm/test_dbm.rb
+++ b/test/dbm/test_dbm.rb
@@ -497,43 +497,41 @@ if defined? DBM
   end
 
   class TestDBM2 < Test::Unit::TestCase
-    TMPROOT = "#{Dir.tmpdir}/ruby-dbm.#{$$}"
-
     def setup
-      Dir.mkdir TMPROOT, 0755
+      @tmproot = Dir.mktmpdir('ruby-dbm')
     end
 
     def teardown
-      FileUtils.rm_rf TMPROOT if File.directory?(TMPROOT)
+      FileUtils.remove_entry_secure @tmproot if File.directory?(@tmproot)
     end
 
     def test_reader_open_notexist
       assert_raise(Errno::ENOENT) {
-        DBM.open("#{TMPROOT}/a", 0666, DBM::READER)
+        DBM.open("#{@tmproot}/a", 0666, DBM::READER)
       }
     end
 
     def test_writer_open_notexist
       assert_raise(Errno::ENOENT) {
-        DBM.open("#{TMPROOT}/a", 0666, DBM::WRITER)
+        DBM.open("#{@tmproot}/a", 0666, DBM::WRITER)
       }
     end
 
     def test_wrcreat_open_notexist
-      v = DBM.open("#{TMPROOT}/a", 0666, DBM::WRCREAT)
+      v = DBM.open("#{@tmproot}/a", 0666, DBM::WRCREAT)
       assert_instance_of(DBM, v)
       v.close
     end
 
     def test_newdb_open_notexist
-      v = DBM.open("#{TMPROOT}/a", 0666, DBM::NEWDB)
+      v = DBM.open("#{@tmproot}/a", 0666, DBM::NEWDB)
       assert_instance_of(DBM, v)
       v.close
     end
 
     def test_reader_open
-      DBM.open("#{TMPROOT}/a") {} # create a db.
-      v = DBM.open("#{TMPROOT}/a", nil, DBM::READER) {|d|
+      DBM.open("#{@tmproot}/a") {} # create a db.
+      v = DBM.open("#{@tmproot}/a", nil, DBM::READER) {|d|
         # Errno::EPERM is raised on Solaris which use ndbm.
         # DBMError is raised on Debian which use gdbm. 
         assert_raises(Errno::EPERM, DBMError) { d["k"] = "v" }
@@ -543,10 +541,10 @@ if defined? DBM
     end
 
     def test_newdb_open
-      DBM.open("#{TMPROOT}/a") {|dbm|
+      DBM.open("#{@tmproot}/a") {|dbm|
         dbm["k"] = "v"
       }
-      v = DBM.open("#{TMPROOT}/a", nil, DBM::NEWDB) {|d|
+      v = DBM.open("#{@tmproot}/a", nil, DBM::NEWDB) {|d|
         assert_equal(0, d.length)
         assert_nil(d["k"])
         true
@@ -555,7 +553,7 @@ if defined? DBM
     end
 
     def test_freeze
-      DBM.open("#{TMPROOT}/a") {|d|
+      DBM.open("#{@tmproot}/a") {|d|
         d.freeze
         assert_raises(RuntimeError) { d["k"] = "v" }
       }
-- 
cgit v1.2.3