Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test/test_find.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def test_dont_follow_symlink
begin
File.symlink("#{d}/b", "#{d}/c")
rescue NotImplementedError, Errno::EACCES
skip "symlink is not supported."
omit "symlink is not supported."
end
a = []
Find.find(d) {|f| a << f }
Expand Down Expand Up @@ -103,8 +103,8 @@ def test_countdown3
end

def test_unreadable_dir
skip "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
skip "because root can read anything" if Process.uid == 0
omit "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
omit "because root can read anything" if Process.uid == 0

Dir.mktmpdir {|d|
Dir.mkdir(dir = "#{d}/dir")
Expand Down Expand Up @@ -158,8 +158,8 @@ def test_unsearchable_dir
Find.find(d, ignore_error: true).each {|f| a << f }
assert_equal([d, dir, file], a)

skip "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
skip "skipped because root can read anything" if Process.uid == 0
omit "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
omit "skipped because root can read anything" if Process.uid == 0

a = []
assert_raise_with_message(Errno::EACCES, /#{Regexp.quote(file)}/) do
Expand All @@ -185,7 +185,7 @@ def test_dangling_symlink
begin
File.symlink("foo", "#{d}/bar")
rescue NotImplementedError, Errno::EACCES
skip "symlink is not supported."
omit "symlink is not supported."
end
a = []
Find.find(d) {|f| a << f }
Expand All @@ -199,7 +199,7 @@ def test_dangling_symlink_stat_error
begin
File.symlink("foo", "#{d}/bar")
rescue NotImplementedError, Errno::EACCES
skip "symlink is not supported."
omit "symlink is not supported."
end
assert_raise(Errno::ENOENT) {
Find.find(d) {|f| File.stat(f) }
Expand Down Expand Up @@ -245,7 +245,7 @@ def test_change_dir_to_symlink_loop
begin
File.symlink("d1", dir_1)
rescue NotImplementedError, Errno::EACCES
skip "symlink is not supported."
omit "symlink is not supported."
end
end
}
Expand Down