summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-25 09:13:58 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-25 09:13:58 +0000
commit0452420e4c33b32050aa46bc08d39b7f35dc3864 (patch)
treed7cac90a2414dd9e04feed41a026c2f32eb1676b
parenta3388b68b7d2babce3d696cacb3e4cbfcd898490 (diff)
* test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each test. [ruby-dev:22045]
* test/fileutils/test_nowrite.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/fileutils/test_fileutils.rb6
-rw-r--r--test/fileutils/test_nowrite.rb6
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f542abfce91..a4fcaa7ab56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 25 18:13:30 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
+ test. [ruby-dev:22045]
+
+ * test/fileutils/test_nowrite.rb: ditto.
+
Tue Nov 25 17:52:11 2003 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index fa5bf7b7fc7..49e637d83b3 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -5,8 +5,9 @@
$:.unshift File.dirname(__FILE__)
require 'fileutils'
-require 'test/unit'
require 'fileasserts'
+require 'tmpdir'
+require 'test/unit'
def have_drive_letter?
@@ -43,6 +44,8 @@ class TestFileUtils < Test::Unit::TestCase
end
def setup
+ @prevdir = Dir.pwd
+ Dir.chdir Dir.tmpdir
my_rm_rf 'data'; Dir.mkdir 'data'
my_rm_rf 'tmp'; Dir.mkdir 'tmp'
prepare_data_file
@@ -52,6 +55,7 @@ class TestFileUtils < Test::Unit::TestCase
def teardown
my_rm_rf 'data'
my_rm_rf 'tmp'
+ Dir.chdir @prevdir
end
diff --git a/test/fileutils/test_nowrite.rb b/test/fileutils/test_nowrite.rb
index d475c3ab028..830fd83c9eb 100644
--- a/test/fileutils/test_nowrite.rb
+++ b/test/fileutils/test_nowrite.rb
@@ -5,8 +5,9 @@
$:.unshift File.dirname(__FILE__)
require 'fileutils'
-require 'test/unit'
require 'fileasserts'
+require 'tmpdir'
+require 'test/unit'
class TestNoWrite < Test::Unit::TestCase
@@ -25,6 +26,8 @@ class TestNoWrite < Test::Unit::TestCase
COPY = 'data/copy'
def setup
+ @prevdir = Dir.pwd
+ Dir.chdir Dir.tmpdir
my_rm_rf 'date'; Dir.mkdir 'data'
my_rm_rf 'tmp'; Dir.mkdir 'tmp'
File.open(SRC, 'w') {|f| f.puts 'dummy' }
@@ -34,6 +37,7 @@ class TestNoWrite < Test::Unit::TestCase
def teardown
my_rm_rf 'data'
my_rm_rf 'tmp'
+ Dir.chdir @prevdir
end
def test_cp