From 628ff67b72385c31d6310bfa7547a8f151f6d2fb Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 13 Dec 2019 14:15:51 +0000 Subject: [PATCH] s3/selftest: Move samba3.unix.whoami to nt4_dc_smb1 Also remove the associated entry from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 2 -- source3/selftest/tests.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index f9e7d7c233b..a155210772b 100644 --- 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 6ee5a7cec17..c27ef13f53e 100755 --- 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"]: