diff options
Diffstat (limited to 'tools/regression/fstest/tests/rename/21.t')
| -rw-r--r-- | tools/regression/fstest/tests/rename/21.t | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tools/regression/fstest/tests/rename/21.t b/tools/regression/fstest/tests/rename/21.t index db69f26..a9445c7 100644 --- a/tools/regression/fstest/tests/rename/21.t +++ b/tools/regression/fstest/tests/rename/21.t @@ -6,7 +6,7 @@ desc="write access to subdirectory is required to move it to another directory" dir=`dirname $0` . ${dir}/../misc.sh -echo "1..13" +echo "1..15" n0=`namegen` n1=`namegen` @@ -18,23 +18,28 @@ expect 0 mkdir ${n3} 0777 cdir=`pwd` # Check that write permission on containing directory (${n2}) is enough -# to rename subdirectory (${n0}). +# to rename subdirectory (${n0}). If we rename directory write access +# to this directory may also be required. expect 0 mkdir ${n2}/${n0} 0700 -expect 0 -u 65534 -g 65534 rename ${n2}/${n0} ${n2}/${n1} +expect "0|EACCES" -u 65534 -g 65534 rename ${n2}/${n0} ${n2}/${n1} +expect "0|EACCES" -u 65534 -g 65534 rename ${n2}/${n1} ${n2}/${n0} # Check that write permission on containing directory (${n2}) is not enough # to move subdirectory (${n0}) from that directory. -expect EACCES -u 65534 -g 65534 rename ${n2}/${n1} ${n3}/${n0} +# Actually POSIX says that write access to ${n2} and ${n3} may be enough +# to move ${n0} from ${n2} to ${n3}. +expect "0|EACCES" -u 65534 -g 65534 rename ${n2}/${n0} ${n3}/${n1} -expect 0 rmdir ${n2}/${n1} -expect ENOENT rmdir ${n2}/${n1} +expect 0 rmdir ${n2}/${n0} +expect ENOENT rmdir ${n2}/${n0} +expect ENOENT rmdir ${n3}/${n1} # Check that write permission on containing directory (${n2}) is enough # to move file (${n0}) from that directory. expect 0 create ${n2}/${n0} 0755 -expect 0 -u 65534 -g 65534 rename ${n2}/${n0} ${n3}/${n0} +expect 0 -u 65534 -g 65534 rename ${n2}/${n0} ${n3}/${n1} -expect 0 unlink ${n3}/${n0} +expect 0 unlink ${n3}/${n1} expect ENOENT unlink ${n2}/${n0} expect 0 rmdir ${n3} |
