From 1a863754faed73a0a9ff1a4ce03bf022e94788c1 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 27 Oct 2008 06:43:13 +0000 Subject: [PATCH] * test/minitest/test_mini_test.rb (test_assert_raises_triggered_different): the test failed when a file path in the backtrace contontains something except [\w\/\.], e.g. hyphen, Japanese characters or backslash. * test/minitest/test_mini_test.rb (test_assert_raises_triggered_subclass): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ test/minitest/test_mini_test.rb | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index facfd683ff..157fa41873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Oct 27 15:38:38 2008 Yuki Sonoda (Yugui) + + * test/minitest/test_mini_test.rb + (test_assert_raises_triggered_different): the test failed when a + file path in the backtrace contontains something except [\w\/\.], + e.g. hyphen, Japanese characters or backslash. + + * test/minitest/test_mini_test.rb + (test_assert_raises_triggered_subclass): ditto. + Mon Oct 27 15:32:08 2008 Yuki Sonoda (Yugui) * test/minitest/test_mini_test.rb: fixed that r19958 made diff --git a/test/minitest/test_mini_test.rb b/test/minitest/test_mini_test.rb index 934de53fb0..2f30232074 100644 --- a/test/minitest/test_mini_test.rb +++ b/test/minitest/test_mini_test.rb @@ -521,7 +521,7 @@ Message: <\"icky\"> FILE:LINE:in `test_assert_raises_triggered_different' ---------------" - actual = e.message.gsub(/[\w\/\.]+:\d+/, 'FILE:LINE') + actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE') actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/ assert_equal expected, actual @@ -553,7 +553,7 @@ Message: <\"E\"> FILE:LINE:in `test_assert_raises_triggered_subclass' ---------------" - actual = e.message.gsub(/[\w\/\.]+:\d+/, 'FILE:LINE') + actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE') actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/ assert_equal expected, actual