summaryrefslogtreecommitdiff
path: root/test/ruby/test_io_m17n.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-04 16:14:51 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-04 16:14:51 +0000
commitafd9ce9d9e00cfc940e4989a34033fa73268d969 (patch)
tree81eb12d1ad0d47c685a3e17d932f20df67fff678 /test/ruby/test_io_m17n.rb
parent66b0d426ed2e918aa4ea637faf208a30a0cb97c8 (diff)
* io.c (parse_mode_enc): remove warnings 'Ignoring internal encoding'.
[ruby-core:44455] [Bug #6324] * io.c (io_encoding_set): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_io_m17n.rb')
-rw-r--r--test/ruby/test_io_m17n.rb15
1 files changed, 8 insertions, 7 deletions
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index be5bacf6883..fcbe6e05198 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -985,26 +985,27 @@ EOT
end
def test_set_encoding_identical
- bug5568 = '[ruby-core:40727]'
+ #bug5568 = '[ruby-core:40727]'
+ bug6324 = '[ruby-core:44455]'
open(__FILE__, "r") do |f|
- assert_warn(/Ignoring internal encoding euc-jp: it is identical to external encoding eucjp/, bug5568) {
+ assert_warn('', bug6324) {
f.set_encoding("eucjp:euc-jp")
}
- assert_warn(/Ignoring internal encoding euc-jp: it is identical to external encoding eucjp/, bug5568) {
+ assert_warn('', bug6324) {
f.set_encoding("eucjp", "euc-jp")
}
- assert_warn(/Ignoring internal encoding euc-jp: it is identical to external encoding EUC-JP/, bug5568) {
+ assert_warn('', bug6324) {
f.set_encoding(Encoding::EUC_JP, "euc-jp")
}
- assert_warn(/Ignoring internal encoding EUC-JP: it is identical to external encoding eucjp/, bug5568) {
+ assert_warn('', bug6324) {
f.set_encoding("eucjp", Encoding::EUC_JP)
}
- assert_warn(/Ignoring internal encoding EUC-JP: it is identical to external encoding EUC-JP/, bug5568) {
+ assert_warn('', bug6324) {
f.set_encoding(Encoding::EUC_JP, Encoding::EUC_JP)
}
nonstr = Object.new
def nonstr.to_str; "eucjp"; end
- assert_warn(/Ignoring internal encoding eucjp: it is identical to external encoding eucjp/, bug5568) {
+ assert_warn('', bug6324) {
f.set_encoding(nonstr, nonstr)
}
end