From 0c2b3f7f4f1628b340d2e08614db608f0e54f96e Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 9 Mar 2013 14:57:48 +0000 Subject: merge revision(s) 39466,39470: [Backport #7935] * random.c (rb_random_ulong_limited): limit is inclusive, but generic rand method should return a number less than it, so increase for the difference. [ruby-core:52779] [Bug #7935] * test/ruby/test_array.rb (test_sample_random): remove adjustment for the bug fixed by r39466. [ruby-core:52779] [Bug #7935] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_array.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/ruby/test_array.rb') diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 3ab0895f8c..17f2ef66c4 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -2055,14 +2055,14 @@ class TestArray < Test::Unit::TestCase ary = (0...10000).to_a assert_raise(ArgumentError) {ary.sample(1, 2, random: nil)} gen0 = proc do |max| - (max+1)/2 + max/2 end class << gen0 alias rand call end gen1 = proc do |max| ary.replace([]) - (max+1)/2 + max/2 end class << gen1 alias rand call -- cgit v1.2.3