From 5dfc455b72707c6e9150b92056d2607a16918f65 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 28 Aug 2015 01:24:36 +0000
Subject: test: File.symlink needs administrator privilege

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/fileutils/test_fileutils.rb  |  2 +-
 test/pathname/test_pathname.rb    |  2 +-
 test/ruby/test_dir.rb             |  4 ++--
 test/ruby/test_file_exhaustive.rb |  2 +-
 test/ruby/test_require.rb         |  2 +-
 test/ruby/test_rubyoptions.rb     | 12 ++++++++----
 test/test_find.rb                 |  8 ++++----
 7 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'test')

diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 5f1cc41e3a..28488cd27f 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -48,7 +48,7 @@ class TestFileUtils < Test::Unit::TestCase
 
     def check_have_symlink?
       File.symlink nil, nil
-    rescue NotImplementedError
+    rescue NotImplementedError, Errno::EACCES
       return false
     rescue
       return true
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index 53baa5cbc8..4842f96d0f 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -340,7 +340,7 @@ class TestPathname < Test::Unit::TestCase
   def has_symlink?
     begin
       File.symlink(nil, nil)
-    rescue NotImplementedError
+    rescue NotImplementedError, Errno::EACCES
       return false
     rescue TypeError
     end
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 44c9b7c5f7..33d83cbca3 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -224,7 +224,7 @@ class TestDir < Test::Unit::TestCase
 	File.symlink(File.join(@root, f),
 		     File.join(@root, "symlink-#{ f }"))
       end
-    rescue NotImplementedError
+    rescue NotImplementedError, Errno::EACCES
       return
     end
 
@@ -303,7 +303,7 @@ class TestDir < Test::Unit::TestCase
       Dir.chdir(dirname) do
         begin
           File.symlink('some-dir', 'dir-symlink')
-        rescue NotImplementedError
+        rescue NotImplementedError, Errno::EACCES
           return
         end
 
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index b36b6168ee..e4b92152e5 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -110,7 +110,7 @@ class TestFileExhaustive < Test::Unit::TestCase
     @symlinkfile = make_tmp_filename("symlinkfile")
     begin
       File.symlink(regular_file, @symlinkfile)
-    rescue NotImplementedError
+    rescue NotImplementedError, Errno::EACCES
       @symlinkfile = nil
     end
     @symlinkfile
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 1d70e39605..25116e4912 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -403,7 +403,7 @@ class TestRequire < Test::Unit::TestCase
           File.symlink("../a/tst.rb", "b/tst.rb")
           result = IO.popen([EnvUtil.rubybin, "b/tst.rb"], &:read)
           assert_equal("a/lib.rb\n", result, "[ruby-dev:40040]")
-        rescue NotImplementedError
+        rescue NotImplementedError, Errno::EACCES
           skip "File.symlink is not implemented"
         end
       }
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index ef9a8f257e..efdaeed237 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -437,10 +437,14 @@ class TestRubyOptions < Test::Unit::TestCase
       }
       if File.respond_to? :symlink
         n2 = File.join(d, 't2')
-        File.symlink(n1, n2)
-        IO.popen([ruby, n2]) {|f|
-          assert_equal(n2, f.read)
-        }
+        begin
+          File.symlink(n1, n2)
+        rescue Errno::EACCES
+        else
+          IO.popen([ruby, n2]) {|f|
+            assert_equal(n2, f.read)
+          }
+        end
       end
       Dir.chdir(d) {
         n3 = '-e'
diff --git a/test/test_find.rb b/test/test_find.rb
index cb2ce56129..2fa81eb0b4 100644
--- a/test/test_find.rb
+++ b/test/test_find.rb
@@ -47,7 +47,7 @@ class TestFind < Test::Unit::TestCase
       File.open("#{d}/b/b", "w"){}
       begin
         File.symlink("#{d}/b", "#{d}/c")
-      rescue NotImplementedError
+      rescue NotImplementedError, Errno::EACCES
         skip "symlink is not supported."
       end
       a = []
@@ -168,7 +168,7 @@ class TestFind < Test::Unit::TestCase
     Dir.mktmpdir {|d|
       begin
         File.symlink("foo", "#{d}/bar")
-      rescue NotImplementedError
+      rescue NotImplementedError, Errno::EACCES
         skip "symlink is not supported."
       end
       a = []
@@ -182,7 +182,7 @@ class TestFind < Test::Unit::TestCase
     Dir.mktmpdir {|d|
       begin
         File.symlink("foo", "#{d}/bar")
-      rescue NotImplementedError
+      rescue NotImplementedError, Errno::EACCES
         skip "symlink is not supported."
       end
       assert_raise(Errno::ENOENT) {
@@ -228,7 +228,7 @@ class TestFind < Test::Unit::TestCase
           File.rename(dir_1, dir_2)
           begin
             File.symlink("d1", dir_1)
-          rescue NotImplementedError
+          rescue NotImplementedError, Errno::EACCES
             skip "symlink is not supported."
           end
         end
-- 
cgit v1.2.3