diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 07:18:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 07:18:45 +0000 |
| commit | 50a334d864cb0dcbe8cf8e1f0403a439e9b3debe (patch) | |
| tree | cbf17ab4f5e84bd3dee3c3ab25c5887c5e42a1d4 /test | |
| parent | a6be951e291fbe376974a56c7b644141a4484876 (diff) | |
merge revision(s) 66973: [Backport #15577]
Run r66972 assertion only when a sticky-bit makes sense
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index 64dd2464c0..f74ae5a755 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -742,13 +742,14 @@ class TestFileUtils < Test::Unit::TestCase assert_file_not_exist 'tmp/tmpdir/c' File.chmod(01777, 'tmp/tmpdir') - Dir.mkdir 'tmp/tmpdir/d', 0 - assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'} - File.chmod 0777, 'tmp/tmpdir/d' - Dir.rmdir 'tmp/tmpdir/d' + if File.sticky?('tmp/tmpdir') + Dir.mkdir 'tmp/tmpdir/d', 0 + assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'} + File.chmod 0777, 'tmp/tmpdir/d' + Dir.rmdir 'tmp/tmpdir/d' + end Dir.rmdir 'tmp/tmpdir' - end def test_remove_entry_secure_symlink |