diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index a83eb1ffcf..9e14668c99 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -815,7 +815,7 @@ class TestPathname < Test::Unit::TestCase 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 @@ class TestPathname < Test::Unit::TestCase 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 @@ class TestPathname < Test::Unit::TestCase 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 @@ class TestPathname < Test::Unit::TestCase 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 @@ class TestPathname < Test::Unit::TestCase 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 @@ class TestPathname < Test::Unit::TestCase 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 @@ class TestPathname < Test::Unit::TestCase 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 9ce43ef640..3d7b63deed 100644 --- a/test/pathname/test_ractor.rb +++ b/test/pathname/test_ractor.rb @@ -4,7 +4,7 @@ require "pathname" class TestPathnameRactor < Test::Unit::TestCase def setup - skip unless defined? Ractor + omit unless defined? Ractor end def test_ractor_shareable