aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 14:43:10 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 14:43:10 +0000
commitec7d935ce7292e88949d23fabdbc04a4b578a5d3 (patch)
tree7db70595ccbc8d6f965be2f7d79c1221778da33d /test/rubygems
parent053ca25f2d3876262e5830438a50816c4b66b944 (diff)
downloadruby-ec7d935ce7292e88949d23fabdbc04a4b578a5d3.tar.gz
* 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
Diffstat (limited to 'test/rubygems')
-rw-r--r--test/rubygems/test_gem_installer.rb2
1 files changed, 1 insertions, 1 deletions
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