From ca5812fe4516a10cc687281f9e47e1a08449f1ab Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Tue, 29 Oct 2019 12:57:31 +0900 Subject: Revert "[ruby/rdoc] Use omit of test-unit instead of skip of minitest" This reverts commit b4da6fc1c277190bbd10e795ebf3be45772038e8. `make test-all` uses minitest, which led to "undefined method `omit'" --- 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 | 6 +++--- test/rdoc/test_rdoc_servlet.rb | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'test') diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb index 66d15d1848..6a95acef73 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 - omit "no zlib" + skip "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 746d659c67..43fd7e2197 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 - omit 'gettext gem is not found' + skip '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 140c4afc9b..bf2ed6eb29 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 - omit "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM - omit "assumes that euid is not root" if Process.euid == 0 + skip "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM + skip "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 7cc3c2d926..57b8e01a87 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 - omit 'chmod not supported' if Gem.win_platform? + skip '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 f2cc901283..29e424d429 100644 --- a/test/rdoc/test_rdoc_rdoc.rb +++ b/test/rdoc/test_rdoc_rdoc.rb @@ -161,7 +161,7 @@ class TestRDocRDoc < RDoc::TestCase def test_normalized_file_list_non_file_directory dev = File::NULL - omit "#{dev} is not a character special" unless + skip "#{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 - omit 'chmod not supported' if Gem.win_platform? - omit "assumes that euid is not root" if Process.euid == 0 + skip 'chmod not supported' if Gem.win_platform? + skip "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 6f17fecec9..4965b3ddd8 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 - omit 'skip test with did_you_men' unless defined? DidYouMean::SpellChecker + skip '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| - omit "couldn't find a standard pager" if io == $stdout + skip "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 - omit "couldn't find a standard pager" unless pager + skip "couldn't find a standard pager" unless pager assert @driver.paging? ensure diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb index 1127408193..ff64d5670f 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 - omit 'File.utime on directory not supported' if Gem.win_platform? + skip '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 - omit 'File.utime on directory not supported' if Gem.win_platform? + skip 'File.utime on directory not supported' if Gem.win_platform? temp_dir do now = Time.now -- cgit v1.2.3