s3/selftest: Move samba3.raw.acls to ad_dc_smb1 env

Test samba3.raw.acls fails in environments that don't support SMB1
so move it to ad_dc_smb1 and remove the entry in skip_smb1_fails

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 3f4e12daf7a8c0316daba49c1d588b255320cd55..99803fb8d4120b633fd90c714f365e3ceee03a69 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -31,7 +31,6 @@
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign\(nt4_dc\)
 ^samba3.rap.sam\(nt4_dc\)
-^samba3.raw.acls\(ad_dc\)
 ^samba3.raw.acls nfs4acl_xattr-nfs-40\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-nfs-41\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-simple-40\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 66d27763404ccbb4b6114527ab879ab1b5d3a19a..cf20b965bd3a627af09f2e7db827396b741ce701 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -649,7 +649,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_xdr_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-xdr-41')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_nfs_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-nfs-40')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_nfs_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-nfs-41')
-        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
     elif t == "smb2.ioctl":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/fs_specific -U$USERNAME%$PASSWORD', 'fs_specific')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')