summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-15 07:32:07 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-15 07:32:07 +0000
commit9972c18c126f209cc7a83dacb3446fbdd6a064a0 (patch)
treeb0160dc58fa3f0033a71df25d69f0de9c0e9ca96
parent1c9df374f32f4f5ff14e83c609c0926c78f0b4ce (diff)
* test/fileutils/test_fileutils.rb (TestFileUtils#test_rmdir):
FileUtils.rmdir ignores Errno::ENOTEMPTY, so, in such cases, this assertion is nonsence. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/fileutils/test_fileutils.rb1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c4041c1df8a..44cf60a3d73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 15 16:30:23 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/fileutils/test_fileutils.rb (TestFileUtils#test_rmdir):
+ FileUtils.rmdir ignores Errno::ENOTEMPTY, so, in such cases, this
+ assertion is nonsence.
+
Thu Aug 15 15:49:35 2013 Tanaka Akira <akr@fsij.org>
* process.c (rb_clock_gettime): [DOC] FreeBSD 7.1 supports
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 65825bd3938..c5f8734fead 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -1243,6 +1243,7 @@ class TestFileUtils
begin
Dir.rmdir '/'
+ rescue Errno::ENOTEMPTY
rescue => e
assert_raise(e.class) {
# Dir.rmdir('') raises Errno::ENOENT.