mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Revert "Revert "[ruby/rdoc] Use omit of test-unit instead of skip of minitest""
This reverts commit ca5812fe45
.
Now tool/lib/minitest provides "omit", so it should work.
This commit is contained in:
parent
1820aeeeb2
commit
79a7fd9120
7 changed files with 13 additions and 13 deletions
|
@ -168,7 +168,7 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
|
|||
begin
|
||||
require 'zlib'
|
||||
rescue LoadError
|
||||
skip "no zlib"
|
||||
omit "no zlib"
|
||||
end
|
||||
@g.generate
|
||||
@g.generate_gzipped
|
||||
|
|
|
@ -32,7 +32,7 @@ class TestRDocI18nLocale < RDoc::TestCase
|
|||
begin
|
||||
require 'gettext/po_parser'
|
||||
rescue LoadError
|
||||
skip 'gettext gem is not found'
|
||||
omit 'gettext gem is not found'
|
||||
end
|
||||
|
||||
fr_locale_dir = File.join @locale_dir, 'fr'
|
||||
|
|
|
@ -17,8 +17,8 @@ class TestRDocOptions < RDoc::TestCase
|
|||
end
|
||||
|
||||
def test_check_files
|
||||
skip "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
|
||||
skip "assumes that euid is not root" if Process.euid == 0
|
||||
omit "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
|
||||
omit "assumes that euid is not root" if Process.euid == 0
|
||||
|
||||
out, err = capture_output do
|
||||
temp_dir do
|
||||
|
|
|
@ -104,7 +104,7 @@ class TestRDocParser < RDoc::TestCase
|
|||
end
|
||||
|
||||
def test_class_for_forbidden
|
||||
skip 'chmod not supported' if Gem.win_platform?
|
||||
omit 'chmod not supported' if Gem.win_platform?
|
||||
|
||||
tf = Tempfile.open 'forbidden' do |io|
|
||||
begin
|
||||
|
|
|
@ -161,7 +161,7 @@ class TestRDocRDoc < RDoc::TestCase
|
|||
|
||||
def test_normalized_file_list_non_file_directory
|
||||
dev = File::NULL
|
||||
skip "#{dev} is not a character special" unless
|
||||
omit "#{dev} is not a character special" unless
|
||||
File.chardev? dev
|
||||
|
||||
files = nil
|
||||
|
@ -355,8 +355,8 @@ class TestRDocRDoc < RDoc::TestCase
|
|||
end
|
||||
|
||||
def test_parse_file_forbidden
|
||||
skip 'chmod not supported' if Gem.win_platform?
|
||||
skip "assumes that euid is not root" if Process.euid == 0
|
||||
omit 'chmod not supported' if Gem.win_platform?
|
||||
omit "assumes that euid is not root" if Process.euid == 0
|
||||
|
||||
@rdoc.store = RDoc::Store.new
|
||||
|
||||
|
|
|
@ -1029,7 +1029,7 @@ Foo::Bar#bother
|
|||
end
|
||||
|
||||
def test_did_you_mean
|
||||
skip 'skip test with did_you_men' unless defined? DidYouMean::SpellChecker
|
||||
omit 'skip test with did_you_men' unless defined? DidYouMean::SpellChecker
|
||||
|
||||
util_ancestors_store
|
||||
|
||||
|
@ -1227,7 +1227,7 @@ Foo::Bar#bother
|
|||
|
||||
with_dummy_pager do
|
||||
@driver.page do |io|
|
||||
skip "couldn't find a standard pager" if io == $stdout
|
||||
omit "couldn't find a standard pager" if io == $stdout
|
||||
|
||||
assert @driver.paging?
|
||||
end
|
||||
|
@ -1406,7 +1406,7 @@ Foo::Bar#bother
|
|||
|
||||
pager = with_dummy_pager do @driver.setup_pager end
|
||||
|
||||
skip "couldn't find a standard pager" unless pager
|
||||
omit "couldn't find a standard pager" unless pager
|
||||
|
||||
assert @driver.paging?
|
||||
ensure
|
||||
|
|
|
@ -294,7 +294,7 @@ class TestRDocServlet < RDoc::TestCase
|
|||
end
|
||||
|
||||
def test_if_modified_since
|
||||
skip 'File.utime on directory not supported' if Gem.win_platform?
|
||||
omit 'File.utime on directory not supported' if Gem.win_platform?
|
||||
|
||||
temp_dir do
|
||||
now = Time.now
|
||||
|
@ -307,7 +307,7 @@ class TestRDocServlet < RDoc::TestCase
|
|||
end
|
||||
|
||||
def test_if_modified_since_not_modified
|
||||
skip 'File.utime on directory not supported' if Gem.win_platform?
|
||||
omit 'File.utime on directory not supported' if Gem.win_platform?
|
||||
|
||||
temp_dir do
|
||||
now = Time.now
|
||||
|
|
Loading…
Reference in a new issue