summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-11 21:23:43 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-11 21:23:43 +0000
commit6a2bd5fcb68568e4b5d8992c0107c7d4338fa958 (patch)
treeecf7b82cde497f5c35e63c997469fbc3cfde4600 /test
parentf2636ad40bd171a08eb69c53cefd9835d07f3bd8 (diff)
merges r30842 from trunk into ruby_1_9_2.
-- * test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_scan): assert_raise does not check exception message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_m17n_comb.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb
index e730f6f0e8..9a8af273c6 100644
--- a/test/ruby/test_m17n_comb.rb
+++ b/test/ruby/test_m17n_comb.rb
@@ -1098,7 +1098,7 @@ class TestM17NComb < Test::Unit::TestCase
if s1.valid_encoding?
assert_raise(Encoding::CompatibilityError) { s1.scan(s2) }
else
- assert_raise(ArgumentError, /invalid byte sequence/) { s1.scan(s2) }
+ assert_match(/invalid byte sequence/, assert_raise(ArgumentError) { s1.scan(s2) }.message)
end
next
end