From fa59a2ea808e6b7af862462c764a2110f1ff7ab2 Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 17 Mar 2017 01:29:22 +0000 Subject: Merge rubygems-2.6.11 This version fixed regression of rubygems-2.6.10. https://github.com/rubygems/rubygems/pull/1856 See details of changelogs for 2.6.11 release: https://github.com/rubygems/rubygems/blob/adfcf40502716080bd9cdfdd2e43bd4296872784/History.txt#L3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem.rb | 30 ++++++++++++++++++------------ test/rubygems/test_gem_ext_rake_builder.rb | 4 ++-- test/rubygems/test_gem_resolver.rb | 6 +++--- 3 files changed, 23 insertions(+), 17 deletions(-) (limited to 'test/rubygems') diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 0b533c5f31..a605f9cdfe 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1443,21 +1443,24 @@ class TestGem < Gem::TestCase ENV['RUBYGEMS_GEMDEPS'] = "-" path = File.join @tempdir, "gem.deps.rb" + cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}", "-rubygems"] + if RUBY_VERSION < '1.9' + cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'" + cmd = cmd.join(' ') + else + cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort" + end File.open path, "w" do |f| f.puts "gem 'a'" end - out0 = IO.popen([Gem.ruby.dup.untaint, "-I#{LIB_PATH}", "-rubygems", - "-eputs Gem.loaded_specs.values.map(&:full_name).sort"], - &:read).split(/\n/) + out0 = IO.popen(cmd, &:read).split(/\n/) File.open path, "a" do |f| f.puts "gem 'b'" f.puts "gem 'c'" end - out = IO.popen([Gem.ruby.dup.untaint, "-I#{LIB_PATH}", "-rubygems", - "-eputs Gem.loaded_specs.values.map(&:full_name).sort"], - &:read).split(/\n/) + out = IO.popen(cmd, &:read).split(/\n/) assert_equal ["b-1", "c-1"], out - out0 end @@ -1482,21 +1485,24 @@ class TestGem < Gem::TestCase Dir.mkdir "sub1" path = File.join @tempdir, "gem.deps.rb" + cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}", "-rubygems"] + if RUBY_VERSION < '1.9' + cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'" + cmd = cmd.join(' ') + else + cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort" + end File.open path, "w" do |f| f.puts "gem 'a'" end - out0 = IO.popen([Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH}", "-rubygems", - "-eputs Gem.loaded_specs.values.map(&:full_name).sort"], - &:read).split(/\n/) + out0 = IO.popen(cmd, &:read).split(/\n/) File.open path, "a" do |f| f.puts "gem 'b'" f.puts "gem 'c'" end - out = IO.popen([Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH}", "-rubygems", - "-eputs Gem.loaded_specs.values.map(&:full_name).sort"], - &:read).split(/\n/) + out = IO.popen(cmd, &:read).split(/\n/) Dir.rmdir "sub1" diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb index 3229982778..9f59f51660 100644 --- a/test/rubygems/test_gem_ext_rake_builder.rb +++ b/test/rubygems/test_gem_ext_rake_builder.rb @@ -53,7 +53,7 @@ class TestGemExtRakeBuilder < Gem::TestCase assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output end - end + end def test_class_build_fail create_temp_mkrf_file("task :default do abort 'fail' end") @@ -69,7 +69,7 @@ class TestGemExtRakeBuilder < Gem::TestCase assert_match %r%^rake failed%, error.message end end - + def create_temp_mkrf_file(rakefile_content) File.open File.join(@ext, 'mkrf_conf.rb'), 'w' do |mkrf_conf| mkrf_conf.puts <<-EO_MKRF diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb index cf457db198..e95a37162d 100644 --- a/test/rubygems/test_gem_resolver.rb +++ b/test/rubygems/test_gem_resolver.rb @@ -521,11 +521,11 @@ class TestGemResolver < Gem::TestCase assert_equal req('>= 0'), dependency.requirement activated = e.conflict.activated - assert_equal 'c-2', activated.full_name + assert_equal 'c-1', activated.full_name - assert_equal dep('c', '>= 2'), activated.request.dependency + assert_equal dep('c', '= 1'), activated.request.dependency - assert_equal [dep('c', '= 1'), dep('c', '>= 2')], + assert_equal [dep('c', '>= 2'), dep('c', '= 1')], e.conflict.conflicting_dependencies end -- cgit v1.2.3