diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-01 11:00:10 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-01 11:00:10 +0900 |
commit | 0b53a8895f143ecc3d97844f5eec685dbd709d85 (patch) | |
tree | edff641a192187de663945dc8e4077990988ca42 /test | |
parent | 9f4bdeb4033c3851a7025bc67052cb5458325849 (diff) |
Merge rubygems master fd676ac464491afaa0baf5435cb11b3f86229cbd
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_require.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index 07e412cc76..4d0301742e 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -466,8 +466,7 @@ class TestGemRequire < Gem::TestCase end def test_realworld_default_gem - testing_ruby_repo = !ENV["GEM_COMMAND"].nil? - pend "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform? + omit "this test can't work under ruby-core setup" if testing_ruby_repo? cmd = <<-RUBY $stderr = $stdout @@ -480,8 +479,7 @@ class TestGemRequire < Gem::TestCase end def test_realworld_upgraded_default_gem - testing_ruby_repo = !ENV["GEM_COMMAND"].nil? - pend "this test can't work under ruby-core setup" if testing_ruby_repo + omit "this test can't work under ruby-core setup" if testing_ruby_repo? newer_json = util_spec("json", "999.99.9", nil, ["lib/json.rb"]) install_gem newer_json @@ -720,6 +718,10 @@ class TestGemRequire < Gem::TestCase private + def testing_ruby_repo? + !ENV["GEM_COMMAND"].nil? + end + def silence_warnings old_verbose, $VERBOSE = $VERBOSE, false yield |