diff options
| author | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-21 17:02:29 +0000 |
|---|---|---|
| committer | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-21 17:02:29 +0000 |
| commit | 0418aab850ed1a86ea5e72945025192034439a4d (patch) | |
| tree | c6ffa2dea2db25db14f4224f05f7936af3f7f3d0 /test | |
| parent | b808fcae8f9af5e4df622674e5692c6c416ac6d4 (diff) | |
merge from trunk (r28316)
* lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
many arguments. [ruby-dev:41481]
* test/drb/test_drb.rb: ditto.
* test/drb/drbtest.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/drb/drbtest.rb | 2 | ||||
| -rw-r--r-- | test/drb/test_drb.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index 38e9b74155..a5222dec60 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -135,7 +135,7 @@ module DRbCore def test_03 assert_equal(8, @there.sum(1, 1, 1, 1, 1, 1, 1, 1)) - assert_raise(ArgumentError) do + assert_raise(DRb::DRbConnError) do @there.sum(1, 1, 1, 1, 1, 1, 1, 1, 1) end assert_raise(DRb::DRbConnError) do diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb index 293102333f..990cb825cf 100644 --- a/test/drb/test_drb.rb +++ b/test/drb/test_drb.rb @@ -283,7 +283,7 @@ class TestDRbLarge < Test::Unit::TestCase end def test_04_many_arg - assert_raise(ArgumentError) { + assert_raise(DRb::DRbConnError) { @there.arg_test(1, 2, 3, 4, 5, 6, 7, 8, 9, 0) } end |