From dc853e330b427feb8a9545cd4900611664d9c2dd Mon Sep 17 00:00:00 2001 From: zzak Date: Thu, 13 Feb 2014 07:55:34 +0000 Subject: [PATCH] * test/ruby/test_array.rb: Ensure flatten! is used for test_flatten Patch by @ksss [Fixes GH-530] https://github.com/ruby/ruby/pull/530 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_array.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e72e8f3e1a..4c600aa94d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 13 16:54:32 2014 Zachary Scott + + * test/ruby/test_array.rb: Ensure flatten! is used for test_flatten + Patch by @ksss [Fixes GH-530] https://github.com/ruby/ruby/pull/530 + Thu Feb 13 15:43:16 2014 Nobuyoshi Nakada * parse.y (IDSET_ATTRSET_FOR_INTERN): fix off-by-one bug. diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 6ff304acb2..d8ee3abb28 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -798,9 +798,9 @@ class TestArray < Test::Unit::TestCase assert_nil(a5.flatten!(0), '[ruby-core:23382]') assert_equal(@cls[1, 2, 3, 4, 5, 6], a5) - assert_equal(@cls[], @cls[].flatten) + assert_nil(@cls[].flatten!) assert_equal(@cls[], - @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten) + @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten!) assert_nil(@cls[].flatten!(0), '[ruby-core:23382]') end