From abd0b91044f50d7f930521a453209ea92a5a49c2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Tue, 7 Sep 2021 12:21:49 +0900
Subject: [PATCH] Prefer omit over skip

---
 test/pathname/test_pathname.rb | 18 +++++++++---------
 test/pathname/test_ractor.rb   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index 8a0f3cb..8bcbcdf 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -815,7 +815,7 @@ def test_atime
   end
 
   def test_birthtime
-    skip if RUBY_PLATFORM =~ /android/
+    omit if RUBY_PLATFORM =~ /android/
     # Check under a (probably) local filesystem.
     # Remote filesystems often may not support birthtime.
     with_tmpchdir('rubytest-pathname') do |dir|
@@ -823,9 +823,9 @@ def test_birthtime
       assert_kind_of(Time, Pathname("a").birthtime)
     rescue Errno::EPERM
       # Docker prohibits statx syscall by the default.
-      skip("statx(2) is prohibited by seccomp")
+      omit("statx(2) is prohibited by seccomp")
     rescue Errno::ENOSYS
-      skip("statx(2) is not supported on this filesystem")
+      omit("statx(2) is not supported on this filesystem")
     rescue NotImplementedError
       # assert_raise(NotImplementedError) do
       #   File.birthtime("a")
@@ -1120,7 +1120,7 @@ def test_exist?
   end
 
   def test_grpowned?
-    skip "Unix file owner test" if DOSISH
+    omit "Unix file owner test" if DOSISH
     with_tmpchdir('rubytest-pathname') {|dir|
       open("f", "w") {|f| f.write "abc" }
       File.chown(-1, Process.gid, "f")
@@ -1175,7 +1175,7 @@ def test_readable?
   end
 
   def test_world_readable?
-    skip "Unix file mode bit test" if DOSISH
+    omit "Unix file mode bit test" if DOSISH
     with_tmpchdir('rubytest-pathname') {|dir|
       open("f", "w") {|f| f.write "abc" }
       File.chmod(0400, "f")
@@ -1227,7 +1227,7 @@ def test_size?
   end
 
   def test_sticky?
-    skip "Unix file mode bit test" if DOSISH
+    omit "Unix file mode bit test" if DOSISH
     with_tmpchdir('rubytest-pathname') {|dir|
       open("f", "w") {|f| f.write "abc" }
       assert_equal(false, Pathname("f").sticky?)
@@ -1249,7 +1249,7 @@ def test_writable?
   end
 
   def test_world_writable?
-    skip "Unix file mode bit test" if DOSISH
+    omit "Unix file mode bit test" if DOSISH
     with_tmpchdir('rubytest-pathname') {|dir|
       open("f", "w") {|f| f.write "abc" }
       File.chmod(0600, "f")
@@ -1409,8 +1409,8 @@ def test_find
         a = []; Pathname("d").find(ignore_error: true) {|v| a << v }; a.sort!
         assert_equal([Pathname("d"), Pathname("d/x")], a)
 
-        skip "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
-        skip 'skipped in root privilege' if Process.uid == 0
+        omit "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
+        omit 'skipped in root privilege' if Process.uid == 0
         a = [];
         assert_raise_with_message(Errno::EACCES, %r{d/x}) do
           Pathname(".").find(ignore_error: false) {|v| a << v }
diff --git a/test/pathname/test_ractor.rb b/test/pathname/test_ractor.rb
index 9ce43ef..3d7b63d 100644
--- a/test/pathname/test_ractor.rb
+++ b/test/pathname/test_ractor.rb
@@ -4,7 +4,7 @@
 
 class TestPathnameRactor < Test::Unit::TestCase
   def setup
-    skip unless defined? Ractor
+    omit unless defined? Ractor
   end
 
   def test_ractor_shareable