diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 20:35:05 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-20 21:58:08 +1000 |
| commit | 74a4c40d4f4bd092d4a71d273f45aab39a8b1cb0 (patch) | |
| tree | fc164364ead5adfa59d5efd8a4de80282d262e50 | |
| parent | c75b6154e475a89c1a43b62c8d8324834397da69 (diff) | |
| download | samba-74a4c40d4f4bd092d4a71d273f45aab39a8b1cb0.tar.gz samba-74a4c40d4f4bd092d4a71d273f45aab39a8b1cb0.tar.xz samba-74a4c40d4f4bd092d4a71d273f45aab39a8b1cb0.zip | |
selftest: Use new fake_acls module
This isolates us from the OS ACL library, and allows chown to 'work'
when we are non-root. In turn, this ensures that we can test the SMB
-> POSIX layer even when the OS would refuse the set due to non-root
or simply not having acls enabled on this particular file system.
This should make a number of build farm tests much more reliable, and
allows a number more tests to pass.
Andrew Bartlett
| -rw-r--r-- | selftest/knownfail | 6 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 2 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/selftest/knownfail b/selftest/knownfail index 1c72718e047..2d33360ce1f 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -43,7 +43,6 @@ ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\] ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\] ^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled -^samba3.raw.samba3checkfsp.samba3checkfsp\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled ^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled ^samba3.raw.acls.generic\(s3dc\) # This fails against smbd ^samba3.base.delete.deltest16a @@ -53,7 +52,6 @@ # these show that we still have some differences between our system # with our internal iconv because it passes except when we bypass our # internal iconv modules -^samba.vfstest.acl.vfstest\(s3dc:local\) #until we get the fake_acls module into selftest ^samba4.local.convert_string_handle.system.iconv.gd_ascii ^samba4.local.convert_string_handle.system.iconv.gd_iso8859_cp850 ^samba4..*base.delete.*.deltest17\( @@ -222,11 +220,7 @@ # but in the interests of ensuring we do not regress, we run the tests # and list the current failures here. # -^samba3.raw.acls.create_file\(plugin_s4_dc\) -^samba3.raw.acls.create_dir\(plugin_s4_dc\) ^samba3.raw.acls.generic\(plugin_s4_dc\) -^samba3.smb2.create.aclfile\(plugin_s4_dc\) -^samba3.smb2.create.acldir\(plugin_s4_dc\) ^samba3.rpc.eventlog.eventlog.GetLogIntormation\(plugin_s4_dc\) ^samba3.rpc.eventlog.eventlog.FlushEventLog\(plugin_s4_dc\) ^samba3.rpc.eventlog.eventlog.ReportEventLog\(plugin_s4_dc\) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 72b9c19c718..31bd15b4646 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -905,7 +905,7 @@ sub provision($$$$$$) store dos attributes = yes create mask = 755 dos filemode = yes - vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so + vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so printing = vlp print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 17afab2e56a..17f3a32a638 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1365,7 +1365,7 @@ sub provision_plugin_s4_dc($$) create mask = 755 dos filemode = yes - vfs objects = acl_xattr xattr_tdb streams_depot + vfs objects = acl_xattr fake_acls xattr_tdb streams_depot dcerpc endpoint servers = -winreg -srvsvc |