From 2cf3d848b66655f62d61dac18b3f182de7921fcb Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Tue, 20 Oct 2009 21:08:32 +0000 Subject: [PATCH] Fix a case where rename actually succeeds, which is also expected behaviour according to POSIX. This fixes ZFS on Solaris testing. Submitted by: Milan Cermak --- tools/regression/fstest/tests/rename/21.t | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/regression/fstest/tests/rename/21.t b/tools/regression/fstest/tests/rename/21.t index 44697453662..2630f628e0e 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..15" +echo "1..16" n0=`namegen` n1=`namegen` @@ -30,8 +30,9 @@ expect "0|EACCES" -u 65534 -g 65534 rename ${n2}/${n1} ${n2}/${n0} # to move ${n0} from ${n2} to ${n3}. expect "0|EACCES" -u 65534 -g 65534 rename ${n2}/${n0} ${n3}/${n1} -expect 0 rmdir ${n2}/${n0} +expect "0|ENOENT" rmdir ${n2}/${n0} expect ENOENT rmdir ${n2}/${n0} +expect "0|ENOENT" rmdir ${n3}/${n1} expect ENOENT rmdir ${n3}/${n1} # Check that write permission on containing directory (${n2}) is enough