aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_array.rb4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 38fecbaab3..5bc9c7bd46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 2 17:13:33 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
+
+ * test/ruby/test_array.rb (test_combination2): Make the test case for
+ [ruby-core:29240] more descriptive.
+ cf. http://bugs.jruby.org/6518
+
Fri Mar 2 16:37:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): use wcscasecmp().
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 28d3e4156b..16875894ef 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -2060,9 +2060,7 @@ class TestArray < Test::Unit::TestCase
end
def test_combination2
- assert_nothing_raised do
- (0..100).to_a.combination(50) { break }
- end
+ assert_equal(:called, (0..100).to_a.combination(50) { break :called }, "[ruby-core:29240] ... must be yielded even if 100C50 > signed integer")
end
def test_product2