Skip to content

Tweaks to play nice with ruby-core setup #3733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deivid-rodriguez merged 2 commits into from
Jun 16, 2020
Merged

Tweaks to play nice with ruby-core setup #3733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98c7d28
Make sure to only reset "dummy" $LOADED_FEATURES
deivid-rodriguez Jun 16, 2020
28ae49a
Tweaks to play nicer with ruby-core parallelized tests
deivid-rodriguez Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lib/rubygems/test_case.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def setup
@orig_env = ENV.to_hash
@tmp = File.expand_path("tmp")

Dir.mkdir @tmp
FileUtils.mkdir_p @tmp

ENV['GEM_VENDOR'] = nil
ENV['GEMRC'] = nil
Expand All @@ -322,7 +322,7 @@ def setup
@tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
@tempdir.tap(&Gem::UNTAINT)

FileUtils.mkdir @tempdir
FileUtils.mkdir_p @tempdir

@orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE
Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
Expand Down Expand Up @@ -429,11 +429,8 @@ def teardown
$LOAD_PATH.replace @orig_LOAD_PATH if @orig_LOAD_PATH
if @orig_LOADED_FEATURES
if @orig_LOAD_PATH
paths = @orig_LOAD_PATH.map {|path| File.join(File.expand_path(path), "/") }
($LOADED_FEATURES - @orig_LOADED_FEATURES).each do |feat|
unless paths.any? {|path| feat.start_with?(path) }
$LOADED_FEATURES.delete(feat)
end
$LOADED_FEATURES.delete(feat) if feat.start_with?(@tmp)
end
else
$LOADED_FEATURES.replace @orig_LOADED_FEATURES
Expand All @@ -448,7 +445,7 @@ def teardown

Dir.chdir @current_dir

FileUtils.rm_rf @tmp
FileUtils.rm_rf @tempdir

ENV.replace(@orig_env)

Expand Down