aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/fileutils/test_fileutils.rb15
2 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e2c4117307..a3692f5bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 4 18:38:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/fileutils/test_fileutils.rb (test_copy_stream):
+ IO.copy_stream support binmode only currently.
+ [ruby-core:23724]
+
Tue May 4 12:46:09 2010 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (argument_error): push correct backtrace.
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 7bedef6974..f385589d0a 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -77,7 +77,7 @@ class TestFileUtils
include FileUtils
def check_singleton(name)
- assert_equal true, ::FileUtils.public_methods.include?(name.to_sym)
+ assert_respond_to ::FileUtils, name
end
def my_rm_rf(path)
@@ -941,20 +941,21 @@ class TestFileUtils
check_singleton :copy_stream
# IO
each_srcdest do |srcpath, destpath|
- File.open(srcpath) {|src|
- File.open(destpath, 'w') {|dest|
+ File.open(srcpath, 'rb') {|src|
+ File.open(destpath, 'wb') {|dest|
copy_stream src, dest
}
}
assert_same_file srcpath, destpath
end
+ end
+ def test_copy_stream_duck
+ check_singleton :copy_stream
# duck typing test [ruby-dev:25369]
- my_rm_rf 'tmp'
- Dir.mkdir 'tmp'
each_srcdest do |srcpath, destpath|
- File.open(srcpath) {|src|
- File.open(destpath, 'w') {|dest|
+ File.open(srcpath, 'rb') {|src|
+ File.open(destpath, 'wb') {|dest|
copy_stream Stream.new(src), Stream.new(dest)
}
}