s3/selftest: Move samba3.unix.whoami to nt4_dc_smb1

Also remove the associated entry from skip_smb1_fail

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 f9e7d7c233b62945322d99d05dd609bf0de0a731..a155210772b4cb885337560281800558abe787f9 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -32,11 +32,9 @@
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW3\(simpleserver\)
 ^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_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_member\)
 ^samba4.blackbox.chgdcpass\(chgdcpass\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 6ee5a7cec176f7a4d4b8728c2e4a41f7ab21ccbe..c27ef13f53e19f359854ce778be8de3a58117fd9 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -578,7 +578,7 @@ for t in tests:
     elif t == "unix.whoami":
         plansmbtorture4testsuite(t, "nt4_member:local", '//$SERVER/tmp --machine-pass', description="machine account")
         plansmbtorture4testsuite(t, "ad_member:local", '//$SERVER/tmp --machine-pass --option=torture:addc=$DC_SERVER', description="machine account")
-        for env in ["nt4_dc", "nt4_member"]:
+        for env in ["nt4_dc_smb1", "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_smb1", "ad_member"]: