From ec7d935ce7292e88949d23fabdbc04a4b578a5d3 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Nov 2012 14:43:10 +0000 Subject: [PATCH] * test/rubygems/test_gem_installer.rb (TestGemInstaller#test_check_executable_overwrite_default_bin_dir): if the executable to be overwritten was generated by rubygems, the error messsage differs from the only copied one's. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/rubygems/test_gem_installer.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dfae754d33..5c0de2ebea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 30 23:39:58 2012 NAKAMURA Usaku + + * test/rubygems/test_gem_installer.rb + (TestGemInstaller#test_check_executable_overwrite_default_bin_dir): + if the executable to be overwritten was generated by rubygems, the + error messsage differs from the only copied one's. + Fri Nov 30 23:27:26 2012 NAKAMURA Usaku * test/rubygems/test_gem_ext_ext_conf_builder.rb diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 23ac5b1f35..7d1abf18c5 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -180,7 +180,7 @@ load Gem.bin_path('a', 'executable', version) end conflicted = File.join @gemhome, 'bin', 'executable' - assert_equal "\"executable\" from a conflicts with #{conflicted}", + assert_match /\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z/, e.message end ensure