From daf5ce3ba1545e295ba2efd0ee153638ae446e6e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 11 Aug 2019 12:50:54 +0900 Subject: Use omit instead of skip for test-unit. --- test/rdoc/helper.rb | 2 -- test/rdoc/test_rdoc_generator_json_index.rb | 2 +- test/rdoc/test_rdoc_i18n_locale.rb | 2 +- test/rdoc/test_rdoc_options.rb | 4 ++-- test/rdoc/test_rdoc_parser.rb | 2 +- test/rdoc/test_rdoc_rdoc.rb | 6 +++--- test/rdoc/test_rdoc_ri_driver.rb | 8 ++++---- test/rdoc/test_rdoc_rubygems_hook.rb | 10 +++++----- test/rdoc/test_rdoc_servlet.rb | 4 ++-- 9 files changed, 19 insertions(+), 21 deletions(-) (limited to 'test/rdoc') diff --git a/test/rdoc/helper.rb b/test/rdoc/helper.rb index a596766760..a900491987 100644 --- a/test/rdoc/helper.rb +++ b/test/rdoc/helper.rb @@ -201,6 +201,4 @@ class RDoc::TestCase < Test::Unit::TestCase end end end - - alias skip omit end diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb index 6a95acef73..66d15d1848 100644 --- a/test/rdoc/test_rdoc_generator_json_index.rb +++ b/test/rdoc/test_rdoc_generator_json_index.rb @@ -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 diff --git a/test/rdoc/test_rdoc_i18n_locale.rb b/test/rdoc/test_rdoc_i18n_locale.rb index 43fd7e2197..746d659c67 100644 --- a/test/rdoc/test_rdoc_i18n_locale.rb +++ b/test/rdoc/test_rdoc_i18n_locale.rb @@ -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' diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb index e3bbf034ff..ff47d7a9a1 100644 --- a/test/rdoc/test_rdoc_options.rb +++ b/test/rdoc/test_rdoc_options.rb @@ -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 diff --git a/test/rdoc/test_rdoc_parser.rb b/test/rdoc/test_rdoc_parser.rb index 57b8e01a87..7cc3c2d926 100644 --- a/test/rdoc/test_rdoc_parser.rb +++ b/test/rdoc/test_rdoc_parser.rb @@ -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 diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb index aa74f65bc3..d7341191e7 100644 --- a/test/rdoc/test_rdoc_rdoc.rb +++ b/test/rdoc/test_rdoc_rdoc.rb @@ -163,7 +163,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 @@ -349,8 +349,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 diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb index 748ddaec31..9bb87b28d1 100644 --- a/test/rdoc/test_rdoc_ri_driver.rb +++ b/test/rdoc/test_rdoc_ri_driver.rb @@ -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 'omit 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 @@ -1239,7 +1239,7 @@ Foo::Bar#bother # this test is too fragile. Perhaps using Process.spawn will make this # reliable def _test_page_in_presence_of_child_status - skip 'this test hangs on travis-ci.org' if ENV['CI'] + omit 'this test hangs on travis-ci.org' if ENV['CI'] @driver.use_stdout = false with_dummy_pager do @@ -1407,7 +1407,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 diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb index 7d59577d97..97b0bd999a 100644 --- a/test/rdoc/test_rdoc_rubygems_hook.rb +++ b/test/rdoc/test_rdoc_rubygems_hook.rb @@ -22,7 +22,7 @@ class TestRDocRubygemsHook < Gem::TestCase begin RDoc::RubygemsHook.load_rdoc rescue Gem::DocumentError => e - skip e.message + omit e.message end Gem.configuration[:rdoc] = nil @@ -205,8 +205,8 @@ class TestRDocRubygemsHook < Gem::TestCase end def test_remove_unwritable - 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 FileUtils.mkdir_p @a.base_dir FileUtils.chmod 0, @a.base_dir @@ -235,8 +235,8 @@ class TestRDocRubygemsHook < Gem::TestCase end def test_setup_unwritable - 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 FileUtils.mkdir_p @a.doc_dir FileUtils.chmod 0, @a.doc_dir diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb index e91c57897a..e57926ecd3 100644 --- a/test/rdoc/test_rdoc_servlet.rb +++ b/test/rdoc/test_rdoc_servlet.rb @@ -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 -- cgit v1.2.3