diff options
author | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2019-12-10 18:31:01 +0900 |
---|---|---|
committer | Kazuhiro NISHIYAMA <znz@users.noreply.github.com> | 2019-12-11 12:35:51 +0900 |
commit | 1ed0212bcf76ec244ca5b75c65f09e5b04158377 (patch) | |
tree | 568a56b9a14edc85d05250a261f44ca88ec2c909 /test/rubygems/test_require.rb | |
parent | 85e43e1dfecef69b935c48c235cc20f21bd4f0d4 (diff) |
Do not load files in build directory
related https://bugs.ruby-lang.org/issues/16177
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2736
Diffstat (limited to 'test/rubygems/test_require.rb')
-rw-r--r-- | test/rubygems/test_require.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 1590c04d21..69df9093c7 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -124,13 +124,13 @@ class TestGemRequire < Gem::TestCase Object.const_set :FILE_ENTERED_LATCH, Latch.new(2) Object.const_set :FILE_EXIT_LATCH, Latch.new(1) - a1 = util_spec "a", "1", nil, "lib/a.rb" - b1 = util_spec "b", "1", nil, "lib/b.rb" + a1 = util_spec "a#{$$}", "1", nil, "lib/a#{$$}.rb" + b1 = util_spec "b#{$$}", "1", nil, "lib/b#{$$}.rb" install_specs a1, b1 - t1 = create_sync_thread{ assert_require 'a' } - t2 = create_sync_thread{ assert_require 'b' } + t1 = create_sync_thread{ assert_require "a#{$$}" } + t2 = create_sync_thread{ assert_require "b#{$$}" } # wait until both files are waiting on the exit latch FILE_ENTERED_LATCH.await @@ -326,7 +326,7 @@ class TestGemRequire < Gem::TestCase end def test_require_doesnt_traverse_development_dependencies - a = util_spec("a", "1", nil, "lib/a.rb") + a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb") z = util_spec("z", "1", "w" => "> 0") w1 = util_spec("w", "1") { |s| s.add_development_dependency "non-existent" } w2 = util_spec("w", "2") { |s| s.add_development_dependency "non-existent" } @@ -337,7 +337,7 @@ class TestGemRequire < Gem::TestCase assert_equal %w(z-1), loaded_spec_names assert_equal ["w (> 0)"], unresolved_names - assert require("a") + assert require("a#{$$}") end def test_default_gem_only @@ -451,15 +451,15 @@ class TestGemRequire < Gem::TestCase end def test_require_default_when_gem_defined - a = util_spec("a", "1", nil, "lib/a.rb") + a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb") install_specs a c = Class.new do def self.gem(*args) raise "received #gem with #{args.inspect}" end end - assert c.send(:require, "a") - assert_equal %w(a-1), loaded_spec_names + assert c.send(:require, "a#{$$}") + assert_equal %W(a#{$$}-1), loaded_spec_names end def test_require_bundler |