summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-03 15:46:29 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-03 15:46:29 +0000
commit5be464239560765b08fa6379b3f6b902c9236877 (patch)
treed5aee69de109a4f7fe2aa1f7fbf194820c611df9
parent441873745517923a1ceecac901331dfea3afd2cd (diff)
add EEXIST for Linux
* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add EEXIST for Linux. (suggested by nurse) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/fileutils/test_fileutils.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa5f0039fc..dc3debf356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 4 00:44:27 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
+ EEXIST for Linux. (suggested by nurse)
+
Mon Jun 3 23:58:19 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/fileutils.rb (FileUtils.rmdir): use remove_tailing_slash.
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 13fb26abc6..f4996e5b9e 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -759,7 +759,8 @@ class TestFileUtils
assert_equal 0700, (File.stat('tmp/tmp').mode & 0777) if have_file_perm?
Dir.rmdir 'tmp/tmp'
- assert_raise(Errno::EISDIR) {
+ # EISDIR on OS X, FreeBSD; EEXIST on Linux
+ assert_raise(Errno::EISDIR, Errno::EEXIST) {
mkdir '/'
}
end