aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-24 23:00:01 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-24 23:00:01 +0000
commit7102c3b1a1185311c70b53aec3475754cb41ad96 (patch)
tree3d7cf5c03319f7a028c8f1f924b37d5b190b835c
parent7a938f98f929b3c52b35df88c7ab141a062c764b (diff)
downloadruby-7102c3b1a1185311c70b53aec3475754cb41ad96.tar.gz
* test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
are handled properly now. ref: [ruby-core:23402] * test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/ruby/test_hash.rb4
-rw-r--r--test/ruby/test_m17n.rb2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9709a3b984..22e0426e18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@ Mon May 25 07:50:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_partition): should use the converted result. a
patch from Marc-Andre Lafortune at [ruby-core:23540].
+Mon May 25 06:25:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
+ are handled properly now. ref: [ruby-core:23402]
+
+ * test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed
+
Mon May 25 05:32:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed. a patch from
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 77084f216f..2f030eac0e 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -770,7 +770,9 @@ class TestHash < Test::Unit::TestCase
h1 = {}; h1[h1] = h1; h1.rehash
h2 = {}; h2[h2] = h2; h2.rehash
- assert(h1 != h2)
+ # assert(h1 != h2)
+ # recursive hashes are handled properly now. [ruby-core:23402]
+ assert(h1 == h2)
end
def test_eql
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 4ddec0371c..eb9aa7c93c 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -770,7 +770,7 @@ class TestM17N < Test::Unit::TestCase
#assert_strenc("\"\xC2\xA1\"", 'Windows-31J', s("%p") % s("\xc2\xa1"))
assert_strenc("\"\xC2\xA1\"", 'UTF-8', u("%p") % u("\xc2\xa1"))
- assert_strenc('"\xC2\xA1"', 'US-ASCII', "%10p" % a("\xc2\xa1"))
+ assert_strenc('"\xC2\xA1"', 'ASCII-8BIT', "%10p" % a("\xc2\xa1"))
assert_strenc(" \"\xC2\xA1\"", 'EUC-JP', "%10p" % e("\xc2\xa1"))
#assert_strenc(" \"\xC2\xA1\"", 'Windows-31J', "%10p" % s("\xc2\xa1"))
assert_strenc(" \"\xC2\xA1\"", 'UTF-8', "%10p" % u("\xc2\xa1"))