summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2021-05-11 18:21:00 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2021-05-12 17:24:43 +0900
commitd33888bf9656818e74401a28dc4725fc8b43ea03 (patch)
treec1d3f53142302829d589a6fab9a54bdc42086012
parent129bc04ab7fb36f8a9e89cbe0264918bd7cc1d02 (diff)
[rubygems/rubygems] Replace skip to pend
https://github.com/rubygems/rubygems/commit/0b145135c7
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/4491
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb6
-rw-r--r--test/rubygems/test_gem_ext_ext_conf_builder.rb16
-rw-r--r--test/rubygems/test_gem_install_update_options.rb4
-rw-r--r--test/rubygems/test_gem_installer.rb8
4 files changed, 17 insertions, 17 deletions
diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb
index a9dc9c2f65..87260bcfa2 100644
--- a/test/rubygems/test_gem_ext_configure_builder.rb
+++ b/test/rubygems/test_gem_ext_configure_builder.rb
@@ -17,7 +17,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
end
def test_self_build
- skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
+ pend("test_self_build skipped on MS Windows (VC++)") if vc_windows?
File.open File.join(@ext, './configure'), 'w' do |configure|
configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
@@ -42,7 +42,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
end
def test_self_build_fail
- skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
+ pend("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
output = []
error = assert_raise Gem::InstallError do
@@ -62,7 +62,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
def test_self_build_has_makefile
if vc_windows? && !nmake_found?
- skip("test_self_build_has_makefile skipped - nmake not found")
+ pend("test_self_build_has_makefile skipped - nmake not found")
end
File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb
index fc431f5084..3b1d1c6777 100644
--- a/test/rubygems/test_gem_ext_ext_conf_builder.rb
+++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb
@@ -16,11 +16,11 @@ class TestGemExtExtConfBuilder < Gem::TestCase
def test_class_build
if java_platform?
- skip("failing on jruby")
+ pend("failing on jruby")
end
if vc_windows? && !nmake_found?
- skip("test_class_build skipped - nmake not found")
+ pend("test_class_build skipped - nmake not found")
end
File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -45,7 +45,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
def test_class_build_rbconfig_make_prog
if java_platform?
- skip("failing on jruby")
+ pend("failing on jruby")
end
configure_args do
@@ -70,7 +70,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
ENV['MAKE'] = 'anothermake'
if java_platform?
- skip("failing on jruby")
+ pend("failing on jruby")
end
configure_args '' do
@@ -93,7 +93,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
def test_class_build_extconf_fail
if vc_windows? && !nmake_found?
- skip("test_class_build_extconf_fail skipped - nmake not found")
+ pend("test_class_build_extconf_fail skipped - nmake not found")
end
File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -119,7 +119,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
def test_class_build_extconf_success_without_warning
if vc_windows? && !nmake_found?
- skip("test_class_build_extconf_fail skipped - nmake not found")
+ pend("test_class_build_extconf_fail skipped - nmake not found")
end
File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -139,7 +139,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
def test_class_build_unconventional
if vc_windows? && !nmake_found?
- skip("test_class_build skipped - nmake not found")
+ pend("test_class_build skipped - nmake not found")
end
File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -180,7 +180,7 @@ end
def test_class_make
if vc_windows? && !nmake_found?
- skip("test_class_make skipped - nmake not found")
+ pend("test_class_make skipped - nmake not found")
end
output = []
diff --git a/test/rubygems/test_gem_install_update_options.rb b/test/rubygems/test_gem_install_update_options.rb
index 6cbf573e0b..92832eaf32 100644
--- a/test/rubygems/test_gem_install_update_options.rb
+++ b/test/rubygems/test_gem_install_update_options.rb
@@ -137,9 +137,9 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
@gem = @spec.cache_file
if win_platform?
- skip('test_user_install_disabled_read_only test skipped on MS Windows')
+ pend('test_user_install_disabled_read_only test skipped on MS Windows')
elsif Process.uid.zero?
- skip('test_user_install_disabled_read_only test skipped in root privilege')
+ pend('test_user_install_disabled_read_only test skipped in root privilege')
else
@cmd.handle_options %w[--no-user-install]
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index f4806b7007..1619a309f7 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -458,9 +458,9 @@ gem 'other', version
Dir.mkdir util_inst_bindir
if win_platform?
- skip('test_generate_bin_script_no_perms skipped on MS Windows')
+ pend('test_generate_bin_script_no_perms skipped on MS Windows')
elsif Process.uid.zero?
- skip('test_generate_bin_script_no_perms skipped in root privilege')
+ pend('test_generate_bin_script_no_perms skipped in root privilege')
else
FileUtils.chmod 0000, util_inst_bindir
@@ -562,9 +562,9 @@ gem 'other', version
Dir.mkdir util_inst_bindir
if win_platform?
- skip('test_generate_bin_symlink_no_perms skipped on MS Windows')
+ pend('test_generate_bin_symlink_no_perms skipped on MS Windows')
elsif Process.uid.zero?
- skip('test_user_install_disabled_read_only test skipped in root privilege')
+ pend('test_user_install_disabled_read_only test skipped in root privilege')
else
FileUtils.chmod 0000, util_inst_bindir