From afd9ce9d9e00cfc940e4989a34033fa73268d969 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 4 May 2012 16:14:51 +0000 Subject: * 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 --- test/ruby/test_io_m17n.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'test/ruby/test_io_m17n.rb') diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index be5bacf688..fcbe6e0519 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 -- cgit v1.2.3