PERFORCE change 152808 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Tue Nov 11 07:27:40 PST 2008


http://perforce.freebsd.org/chv.cgi?CH=152808

Change 152808 by trasz at trasz_victim7 on 2008/11/11 15:27:05

	Fix regression tests after recent change on rename(2) semantics
	when moving directories.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#2 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#2 (text+ko) ====

@@ -24,7 +24,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Moving directory elsewhere allowed on writable directory.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 prependacl . user:65534:write_data::deny
 expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 expect 0 prependacl . user:65534:write_data::allow
@@ -40,7 +40,7 @@
 # Moving directory from elsewhere overwriting local directory allowed
 # on writable directory.
 expect 0 mkdir ${n0} 0755
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 expect 0 prependacl . user:65534:write_data::deny
 expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
 expect 0 prependacl . user:65534:write_data::allow
@@ -54,7 +54,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Denied DELETE changes nothing wrt moving elsewhere or from elsewhere.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
 expect 0 -u 65534 -g 65534 rmdir ${n0}
@@ -67,7 +67,7 @@
 
 # 35
 # DELETE_CHILD denies moving directory elsewhere.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 expect 0 rename ${n0} ../${n3}/${n0}
 
@@ -86,7 +86,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Same for moving the directory elsewhere.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 prependacl ${n0} user:65534:delete::allow
 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 
@@ -99,7 +99,7 @@
 # DELETE does not allow for overwriting a directory in a unwritable
 # directory with DELETE_CHILD denied.
 expect 0 mkdir ${n0} 0755
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 expect 0 prependacl . user:65534:write_data::deny
 expect 0 prependacl . user:65534:delete_child::deny
 expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
@@ -118,7 +118,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Moving things elsewhere is allowed.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 
 # 60
@@ -128,10 +128,10 @@
 
 # Even if we're overwriting.
 # XXX: expect 0 mkdir ${n0} 0755
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 # XXX: expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
 expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 
 # Even if we have DELETE on the existing directory.
 expect 0 prependacl ${n0} user:65534:delete::allow


More information about the p4-projects mailing list