s4/selftest: run samba4.libsmbclient.*.NT1.* tests in ad_dc_smb1

additionally remove those related entries from 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 fe6427715395918a263dd0408f94e6657da994ad..dc60c1854691079c6dc41c6fae1442e027f956eb 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -173,10 +173,6 @@
 ^samba4.blackbox.smbclient\(ad_member:local\)\(ad_member:local\)
 ^samba4.blackbox.smbclient\(chgdcpass:local\)\(chgdcpass:local\)
 ^samba4.ldap.nested-search\(ad_dc_default\)
-^samba4.libsmbclient.list_shares.NT1\(nt4_dc\)
-^samba4.libsmbclient.readdirplus.NT1\(nt4_dc\)
-^samba4.libsmbclient.readdirplus_seek.NT1\(nt4_dc\)
-^samba4.libsmbclient.readdirplus2.NT1\(nt4_dc\)
 ^samba4.rpc.authcontext with bigendian\(ad_dc\)
 ^samba4.rpc.authcontext with seal,padcheck\(ad_dc\)
 ^samba4.rpc.authcontext with validate\(ad_dc\)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f3064c429d100ebd1a93075c121d73384c63e953..a57714618477e10fad6d4f272c0e7dfb0a31f0b7 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -385,7 +385,7 @@ for t in libsmbclient:
     for proto in protocols:
         plansmbtorture4testsuite(
             t,
-            "nt4_dc",
+            "nt4_dc" if proto == "SMB3" else "nt4_dc_smb1_done",
             libsmbclient_testargs +
             [ "--option=torture:clientprotocol=%s" % proto],
             "samba4.%s.%s" % (t, proto))