summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 c4041c1df8..44cf60a3d7 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 65825bd393..c5f8734fea 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.