ruby-changes:70722
From: Hiroshi <ko1@a...>
Date: Tue, 4 Jan 2022 17:26:34 +0900 (JST)
Subject: [ruby-changes:70722] 47bf64a26d (master): Use omit instead of skip: test/ruby/**/*.rb
https://git.ruby-lang.org/ruby.git/commit/?id=47bf64a26d From 47bf64a26d3d95a312ea5cf5d94ee1d2104f5e26 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 4 Jan 2022 17:25:30 +0900 Subject: Use omit instead of skip: test/ruby/**/*.rb --- test/ruby/test_argf.rb | 4 ++-- test/ruby/test_array.rb | 2 +- test/ruby/test_bignum.rb | 4 ++-- test/ruby/test_complex2.rb | 2 +- test/ruby/test_complexrational.rb | 4 ++-- test/ruby/test_default_gems.rb | 2 +- test/ruby/test_dir.rb | 6 +++--- test/ruby/test_exception.rb | 6 +++--- test/ruby/test_fiber.rb | 4 ++-- test/ruby/test_file.rb | 10 +++++----- test/ruby/test_file_exhaustive.rb | 6 +++--- test/ruby/test_gc.rb | 12 ++++++------ test/ruby/test_gc_compact.rb | 6 +++--- test/ruby/test_io.rb | 34 +++++++++++++++++----------------- test/ruby/test_iseq.rb | 2 +- test/ruby/test_jit.rb | 14 +++++++------- test/ruby/test_m17n.rb | 2 +- test/ruby/test_method.rb | 2 +- test/ruby/test_optimization.rb | 2 +- test/ruby/test_process.rb | 32 ++++++++++++++++---------------- test/ruby/test_refinement.rb | 6 +++--- test/ruby/test_require.rb | 12 ++++++------ test/ruby/test_require_lib.rb | 2 +- test/ruby/test_rubyoptions.rb | 12 ++++++------ test/ruby/test_rubyvm_jit.rb | 2 +- test/ruby/test_settracefunc.rb | 2 +- test/ruby/test_signal.rb | 2 +- test/ruby/test_thread.rb | 12 ++++++------ test/ruby/test_thread_queue.rb | 4 ++-- test/ruby/test_time.rb | 10 +++++----- test/ruby/test_time_tz.rb | 2 +- test/ruby/test_vm_dump.rb | 2 +- 32 files changed, 112 insertions(+), 112 deletions(-) diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb index e3bd1cd075c..dbffd24370f 100644 --- a/test/ruby/test_argf.rb +++ b/test/ruby/test_argf.rb @@ -257,13 +257,13 @@ class TestArgf < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_argf.rb#L257 def test_inplace_nonascii ext = Encoding.default_external or - skip "no default external encoding" + omit "no default external encoding" t = nil ["\u{3042}", "\u{e9}"].any? do |n| t = make_tempfile(n.encode(ext)) rescue Encoding::UndefinedConversionError end - t or skip "no name to test" + t or omit "no name to test" assert_in_out_err(["-i.bak", "-", t.path], "#{<<~"{#"}\n#{<<~'};'}") {# diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index a97a9c25580..b100cf334ce 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -3270,7 +3270,7 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_array.rb#L3270 end EOS rescue Timeout::Error => e - skip e.message + omit e.message end end diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb index 3ffe7114b5f..53a2b20cc84 100644 --- a/test/ruby/test_bignum.rb +++ b/test/ruby/test_bignum.rb @@ -644,7 +644,7 @@ class TestBignum < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_bignum.rb#L644 thread.raise thread.join time = Time.now - time - skip "too fast cpu" if end_flag + omit "too fast cpu" if end_flag assert_operator(time, :<, 10) end @@ -675,7 +675,7 @@ class TestBignum < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_bignum.rb#L675 return end end - skip "cannot create suitable test case" + omit "cannot create suitable test case" ensure Signal.trap(:INT, oldtrap) if oldtrap end diff --git a/test/ruby/test_complex2.rb b/test/ruby/test_complex2.rb index 594fc3f45a6..b89e83efb2b 100644 --- a/test/ruby/test_complex2.rb +++ b/test/ruby/test_complex2.rb @@ -4,7 +4,7 @@ require 'test/unit' https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complex2.rb#L4 class Complex_Test2 < Test::Unit::TestCase def test_kumi - skip unless defined?(Rational) + omit unless defined?(Rational) assert_equal(Complex(1, 0), +Complex(1, 0)) assert_equal(Complex(-1, 0), -Complex(1, 0)) diff --git a/test/ruby/test_complexrational.rb b/test/ruby/test_complexrational.rb index bf4e2b1809d..31d11fe3179 100644 --- a/test/ruby/test_complexrational.rb +++ b/test/ruby/test_complexrational.rb @@ -4,7 +4,7 @@ require 'test/unit' https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L4 class ComplexRational_Test < Test::Unit::TestCase def test_rat_srat - skip unless defined?(Rational) + omit unless defined?(Rational) c = SimpleRat(1,3) cc = Rational(3,2) @@ -89,7 +89,7 @@ class ComplexRational_Test < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L89 end def test_comp_srat - skip unless defined?(Rational) + omit unless defined?(Rational) c = Complex(SimpleRat(2,3),SimpleRat(1,2)) cc = Complex(Rational(3,2),Rational(2,1)) diff --git a/test/ruby/test_default_gems.rb b/test/ruby/test_default_gems.rb index 3c4aea15617..467e5ecf835 100644 --- a/test/ruby/test_default_gems.rb +++ b/test/ruby/test_default_gems.rb @@ -4,7 +4,7 @@ require 'rubygems' https://github.com/ruby/ruby/blob/trunk/test/ruby/test_default_gems.rb#L4 class TestDefaultGems < Test::Unit::TestCase def test_validate_gemspec - skip "git not found" unless system("git", "rev-parse", %i[out err]=>IO::NULL) + omit "git not found" unless system("git", "rev-parse", %i[out err]=>IO::NULL) srcdir = File.expand_path('../../..', __FILE__) Dir.glob("#{srcdir}/{lib,ext}/**/*.gemspec").map do |src| assert_nothing_raised do diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb index 9474c6e927f..514c6e5921e 100644 --- a/test/ruby/test_dir.rb +++ b/test/ruby/test_dir.rb @@ -152,7 +152,7 @@ class TestDir < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_dir.rb#L152 end def test_chroot_nodir - skip if RUBY_PLATFORM =~ /android/ + omit if RUBY_PLATFORM =~ /android/ assert_raise(NotImplementedError, Errno::ENOENT, Errno::EPERM ) { Dir.chroot(File.join(@nodir, "")) } end @@ -490,9 +490,9 @@ class TestDir < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_dir.rb#L490 def test_glob_legacy_short_name bug10819 = '[ruby-core:67954] [Bug #10819]' bug11206 = '[ruby-core:69435] [Bug #11206]' - skip unless /\A\w:/ =~ ENV["ProgramFiles"] + omit unless /\A\w:/ =~ ENV["ProgramFiles"] short = "#$&/PROGRA~1" - skip unless File.directory?(short) + omit unless File.directory?(short) entries = Dir.glob("#{short}/Common*") assert_not_empty(entries, bug10819) long = File.expand_path(short) diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 4ddd6011b9c..2985f75fd60 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -561,7 +561,7 @@ end.join https://github.com/ruby/ruby/blob/trunk/test/ruby/test_exception.rb#L561 end def test_ensure_after_nomemoryerror - skip "Forcing NoMemoryError causes problems in some environments" + omit "Forcing NoMemoryError causes problems in some environments" assert_separately([], "$_ = 'a' * 1_000_000_000_000_000_000") rescue NoMemoryError assert_raise(NoMemoryError) do @@ -1064,7 +1064,7 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| https://github.com/ruby/ruby/blob/trunk/test/ruby/test_exception.rb#L1064 end def test_warn_deprecated_backwards_compatibility_category - skip "no method to test" + omit "no method to test" warning = capture_warning_warn { } @@ -1072,7 +1072,7 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| https://github.com/ruby/ruby/blob/trunk/test/ruby/test_exception.rb#L1072 end def test_warn_deprecated_category - skip "no method to test" + omit "no method to test" warning = capture_warning_warn(category: true) { } diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index 3aad5dd09c7..83717651eae 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -34,7 +34,7 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_fiber.rb#L34 end def test_many_fibers - skip 'This is unstable on GitHub Actions --jit-wait. TODO: debug it' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? + omit 'This is unstable on GitHub Actions --jit-wait. TODO: debug it' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? max = 1000 assert_equal(max, max.times{ Fiber.new{} @@ -381,7 +381,7 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_fiber.rb#L381 def test_fork_from_fiber - skip 'fork not supported' unless Process.respond_to?(:fork) + omit 'fork not supported' unless Process.respond_to?(:fork) pid = nil bug5700 = '[ruby-core:41456]' assert_nothing_raised(bug5700) do diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index d570b6f6fbd..905416911a9 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -273,7 +273,7 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file.rb#L273 begin File.symlink(tst, a) rescue Errno::EACCES, Errno::EPERM - skip "need privilege" + omit "need privilege" end assert_equal(File.join(realdir, tst), File.realpath(a)) File.unlink(a) @@ -317,7 +317,7 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_file.rb#L317 Dir.mktmpdir('rubytest-realpath') {|tmpdir| Dir.chdir(tmpdir) do Dir.mkdir('foo') - skip "cannot run m (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/