s3/selftest: Move samba3.unix.whoami* tests to ad_dc_smb1

The following tests which fail in environments that dont support
SMB1 have been moved to ad_dc_smb1

samba3.unix.whoami
samba3.unix.whoami kerberos connection
samba3.unix.whoami anonymous connection
samba3.unix.whoami ntlm user@realm

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

diff --git a/selftest/knownfail b/selftest/knownfail
index bac3ac62b2dab50e7a53e424dbb68791f39dc84b..ff867e21e693afd7ae40fc4655845d302c4e181b 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -59,7 +59,7 @@
 ^samba3.raw.acls nfs4acl_xattr-nfs-41.nulldacl\(nt4_dc\)
 ^samba3.base.delete.deltest16a
 ^samba3.base.delete.deltest17a
-^samba3.unix.whoami anonymous connection.whoami\(ad_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
+^samba3.unix.whoami anonymous connection.whoami\(ad_dc_smb1\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
 # 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_smb1_fails b/selftest/skip_smb1_fails
index 224253594cde6fd05bb5e994fade83c507c1ba3c..0215716b10dc5eaba35bfde23bc55c894a489858 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -165,17 +165,14 @@
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW1\(simpleserver\)
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW2\(simpleserver\)
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW3\(simpleserver\)
-^samba3.unix.whoami\(ad_dc\)
 ^samba3.unix.whoami\(ad_member\)
 ^samba3.unix.whoami anonymous connection\(ad_member\)
 ^samba3.unix.whoami anonymous connection\(nt4_dc\)
 ^samba3.unix.whoami anonymous connection\(nt4_member\)
-^samba3.unix.whoami kerberos connection\(ad_dc\)
 ^samba3.unix.whoami kerberos connection\(ad_member\)
 ^samba3.unix.whoami machine account\(ad_member:local\)
 ^samba3.unix.whoami\(nt4_dc\)
 ^samba3.unix.whoami\(nt4_member\)
-^samba3.unix.whoami ntlm user@realm\(ad_dc\)
 ^samba3.unix.whoami ntlm user@realm\(ad_member\)
 ^samba4.blackbox.chgdcpass\(chgdcpass\)
 ^samba4.blackbox.kinit_trust\(fl2003dc:local\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 042463b2ea29dc43c7d837d9a4847b5efe5e8dc6..afcf96e453a00fb7f9e83dc4597baf81babc0326 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -572,7 +572,7 @@ for t in tests:
         for env in ["nt4_dc", "nt4_member"]:
             plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD')
             plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U%', description='anonymous connection')
-        for env in ["ad_dc", "ad_member"]:
+        for env in ["ad_dc_smb1", "ad_member"]:
             plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$DC_USERNAME@$REALM%$DC_PASSWORD --option=torture:addc=$DC_SERVER')
             plansmbtorture4testsuite(t, env, '//$SERVER/tmp -k yes -U$DC_USERNAME@$REALM%$DC_PASSWORD --option=torture:addc=$DC_SERVER', description='kerberos connection')
             plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U% --option=torture:addc=$DC_SERVER', description='anonymous connection')