summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-25 16:26:50 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-25 17:43:23 +1000
commite346bba1fc369cc13438cf3882961ef7b11ccc3a (patch)
treeb46e48b57095e76ff9ea614f23c9c2bad2d045cc /selftest
parent594e3161810ba5a57ce5a3c88a8cd89b11d04650 (diff)
downloadsamba-e346bba1fc369cc13438cf3882961ef7b11ccc3a.tar.gz
samba-e346bba1fc369cc13438cf3882961ef7b11ccc3a.tar.bz2
samba-e346bba1fc369cc13438cf3882961ef7b11ccc3a.zip
s4-torture: enable raw.composite test again, and convert to new style test
This test has been skipped for some time, but is an important test for parallel operation. Andrew Bartlett
Diffstat (limited to 'selftest')
-rw-r--r--selftest/knownfail1
-rw-r--r--selftest/skip2
2 files changed, 1 insertions, 2 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 959e3d2838..82ff0d6442 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -35,6 +35,7 @@
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,smb2,bigendian\]
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\]
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\]
+^samba3.raw.composite .appendacl # This needs ACL and IDMAP behaviour that s3 cannot provide, including mapping of arbitary sids.
# 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
diff --git a/selftest/skip b/selftest/skip
index 8d797f42ac..68a32a6afa 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -35,7 +35,6 @@
^samba3.smbtorture_s3.LOCAL-DBTRANS #hangs for some reason
^samba3.*base.charset
^samba3.*raw.acls
-^samba3.*raw.composite
^samba3.*raw.context
^samba3.*raw.ioctl
^samba3.*raw.qfileinfo
@@ -43,7 +42,6 @@
^samba3.*raw.sfileinfo.base
^samba3.smb2.hold-oplock # Not a test, but a way to block other clients for a test
^samba3.smb2.scan # No tests
-^samba4.raw.composite
^samba4.base.iometer
^samba4.base.casetable
^samba4.base.nttrans