merge revision(s) 41853: [Backport #8633]

	* lib/fileutils.rb (FileUtils#mode_to_s): Define mode_to_s() also
	  as singleton method, or FileUtils.chmod fails in verbose mode.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 17 insertions, 1 deletions

diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 54742d1d18..640c3655f4 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -991,7 +991,6 @@ class TestFileUtils
   def test_chmod_verbose
     check_singleton :chmod
 
-    r, w = IO.pipe
     stderr_back = $stderr
     read, $stderr = IO.pipe
     th = Thread.new { read.read }
@@ -1009,6 +1008,23 @@ class TestFileUtils
     $stderr = stderr_back if stderr_back
   end if have_file_perm?
 
+  def test_s_chmod_verbose
+    output_back = FileUtils.instance_variable_get(:@fileutils_output)
+    read, write = IO.pipe
+    FileUtils.instance_variable_set(:@fileutils_output, write)
+    th = Thread.new { read.read }
+
+    touch 'tmp/a'
+    FileUtils.chmod 0700, 'tmp/a', verbose: true
+    assert_equal 0700, File.stat('tmp/a').mode & 0777
+
+    write.close
+    lines = th.value.lines.map {|l| l.chomp }
+    assert_equal(["chmod 700 tmp/a"], lines)
+  ensure
+    FileUtils.instance_variable_set(:@fileutils_output, output_back) if output_back
+  end if have_file_perm?
+
   # FIXME: How can I test this method?
   def test_chown
     check_singleton :chown