diff options
| -rw-r--r-- | lib/fileutils.rb | 2 | ||||
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 113796a3a3..67a332333f 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1623,7 +1623,7 @@ module FileUtils def fu_output_message(msg) #:nodoc: output = @fileutils_output if defined?(@fileutils_output) - output ||= $stderr + output ||= $stdout if defined?(@fileutils_label) msg = @fileutils_label + msg end diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index fbc8e3dd83..63936d1a05 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -1748,16 +1748,16 @@ class TestFileUtils < Test::Unit::TestCase o.extend(FileUtils) o.singleton_class.send(:public, :chdir) o.freeze - orig_stderr = $stderr - $stderr = StringIO.new + orig_stdout = $stdout + $stdout = StringIO.new o.chdir('.', verbose: true){} - $stderr.rewind - assert_equal(<<-END, $stderr.read) + $stdout.rewind + assert_equal(<<-END, $stdout.read) cd . cd - END ensure - $stderr = orig_stderr if orig_stderr + $stdout = orig_stdout if orig_stdout end def test_getwd |