diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 17 |
2 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Dec 27 15:29:12 2004 Minero Aoki <aamine@loveruby.net> + + * test/fileutils/test_fileutils.rb (cp_r): tested wrong file name. + [ruby-dev:25339] + Mon Dec 27 15:15:18 2004 Minero Aoki <aamine@loveruby.net> * lib/fileutils.rb (mv): should raise error when moving a diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index a10bbe2369..a34da88421 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -68,7 +68,7 @@ class TestFileUtils include FileUtils - def my_rm_rf( path ) + def my_rm_rf(path) if File.exist?('/bin/rm') system %Q[/bin/rm -rf "#{path}"] else @@ -235,8 +235,8 @@ end cp_r 'data', 'tmp2', :preserve => true TARGETS.each do |fname| - assert_same_entry fname, "tmp/#{fname}" - assert_same_file fname, "tmp/#{fname}" + assert_same_entry fname, "tmp2/#{File.basename(fname)}" + assert_same_file fname, "tmp2/#{File.basename(fname)}" end # a/* -> b/* @@ -294,6 +294,17 @@ end assert_same_file fname, 'tmp/mvdest' end + # [ruby-talk:124368] + mkdir 'tmp/tmpdir' + mkdir_p 'tmp/dest2/tmpdir' + assert_raises(Errno::EISDIR) { + mv 'tmp/tmpdir', 'tmp/dest2' + } + mkdir 'tmp/dest2/tmpdir/junk' + assert_raises(Errno::EISDIR) { + mv 'tmp/tmpdir', 'tmp/dest2' + } + # src==dest (1) same path touch 'tmp/cptmp' assert_raises(ArgumentError) { |