kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Fix check for testing in the ruby repository

Browse source 
* When testing in the rubygems/rubygems repository, the previous code would
  move the lib/ dir at the end of $LOAD_PATH, which would cause to load
  a mix of lib/ RubyGems and in-stdlib-dir RubyGems, which blows up.

https://github.com/rubygems/rubygems/commit/f6f6f00ed1
This commit is contained in:
Benoit Daloze 2020-04-22 21:20:06 +02:00 • committed by Hiroshi SHIBATA
parent 709d58446f
commit 5f0e84ba8d
Notes: git 2020-06-05 07:33:40 +09:00
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/rubygems/test_require.rb
View file

@ -252,11 +252,14 @@ class TestGemRequire < Gem::TestCase
stdlib one is already in $LOADED_FEATURES?. Reproducible by running the stdlib one is already in $LOADED_FEATURES?. Reproducible by running the
spaceship_specific_file test before this one" if java_platform? spaceship_specific_file test before this one" if java_platform?
lib_dir = File.expand_path("../../lib", File.dirname(__FILE__))
if RbConfig::CONFIG["rubylibdir"] == lib_dir
# testing in the ruby repository where RubyGems' lib/ == stdlib lib/
# In that case we want to move the stdlib lib/ to still be after b-2 in $LOAD_PATH
lp = $LOAD_PATH.dup lp = $LOAD_PATH.dup
lib_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../lib"))
if File.exist?(lib_dir)
$LOAD_PATH.delete lib_dir $LOAD_PATH.delete lib_dir
$LOAD_PATH.push lib_dir $LOAD_PATH.push lib_dir
load_path_changed = true
end end
require 'benchmark' # the stdlib require 'benchmark' # the stdlib
@ -269,6 +272,7 @@ class TestGemRequire < Gem::TestCase
# Activates a-1, but not b-1 and b-2 # Activates a-1, but not b-1 and b-2
assert_require 'test_gem_require_a' assert_require 'test_gem_require_a'
assert_equal %w[a-1], loaded_spec_names
assert $LOAD_PATH.include? a1.load_paths[0] assert $LOAD_PATH.include? a1.load_paths[0]
refute $LOAD_PATH.include? b1.load_paths[0] refute $LOAD_PATH.include? b1.load_paths[0]
refute $LOAD_PATH.include? b2.load_paths[0] refute $LOAD_PATH.include? b2.load_paths[0]
@ -281,7 +285,10 @@ class TestGemRequire < Gem::TestCase
# and that still exists in $LOAD_PATH (further down), # and that still exists in $LOAD_PATH (further down),
# and as a result #gem_original_require returns false. # and as a result #gem_original_require returns false.
refute require('benchmark'), "the benchmark stdlib should be recognized as already loaded" refute require('benchmark'), "the benchmark stdlib should be recognized as already loaded"
assert $LOAD_PATH.include? b2.load_paths[0] assert $LOAD_PATH.include? b2.load_paths[0]
assert $LOAD_PATH.index(b2.load_paths[0]) < $LOAD_PATH.index(RbConfig::CONFIG["rubylibdir"]),
"this test relies on the b-2 gem lib/ to be before stdlib to make sense"
# We detected that we should activate b-2, so we did so, but # We detected that we should activate b-2, so we did so, but
# then #gem_original_require decided "I've already got some benchmark.rb" loaded. # then #gem_original_require decided "I've already got some benchmark.rb" loaded.
@ -290,7 +297,7 @@ class TestGemRequire < Gem::TestCase
assert_equal %w[a-1 b-2], loaded_spec_names assert_equal %w[a-1 b-2], loaded_spec_names
ensure ensure
$LOAD_PATH.replace lp unless java_platform? $LOAD_PATH.replace lp if load_path_changed
end end
def test_already_activated_direct_conflict def test_already_activated_direct_conflict