From: Noel Power <noel.power@suse.com>
Date: Wed, 11 Dec 2019 18:46:36 +0000 (+0000)
Subject: s3/selftest: Move samba3.raw.search to ad_dc_smb1 environments
X-Git-Tag: ldb-2.2.0~1073
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83f1a9a2505ecc30d70d130b56685397338b9549;p=thirdparty%2Fsamba.git

s3/selftest: Move samba3.raw.search to ad_dc_smb1 environments

Test samba3.raw.search fails in envrionments that don't support SMB1
so we move it to ad_dc_smb1 and also 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 f472ff0c86b..e1c07cbab81 100644
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -54,7 +54,6 @@
 ^samba3.raw.samba3posixtimedlock\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock brl_delay_inject1\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock brl_delay_inject2\(nt4_dc\)
-^samba3.raw.search\(ad_dc\)
 ^samba3.raw.search\(nt4_dc\)
 ^samba3.raw.session plain\(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,bigendian\] \(nt4_dc\)
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index f9c2ab3a0d7..7c2fd8060bf 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -667,7 +667,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
 # test the dirsort module.
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpsort -U$USERNAME%$PASSWORD')
-        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     elif t == "vfs.fruit":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share --option=torture:share2=vfs_wo_fruit', 'metadata_netatalk')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_metadata_stream -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share --option=torture:share2=vfs_wo_fruit', 'metadata_stream')