From: Volker Lendecke <vl@samba.org>
Date: Thu, 27 Feb 2020 08:52:30 +0000 (-0800)
Subject: selftest: Run libsmbclient with and without unix extensions
X-Git-Tag: ldb-2.2.0~1558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb37caaa56ad9bac0df3092f64c9b0b08f4b3a9b;p=thirdparty%2Fsamba.git

selftest: Run libsmbclient with and without unix extensions

The libsmbclient readdir tests are broken just for the unix extension
case. For example they assume our "map archive" behaviour. This will
have to be parameterized once unix extensions become better
implemented in libsmbclient

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Feb 27 19:34:36 UTC 2020 on sn-devel-184
---

diff --git a/selftest/knownfail b/selftest/knownfail
index e3ac069f0d4..79766000d2f 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -140,7 +140,7 @@
 ^samba4.smb2.acls.*.ACCESSBASED
 ^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
 #^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.*
-^samba4.libsmbclient.opendir.(NT1|SMB3).opendir # This requires netbios browsing
+^samba4.*libsmbclient.opendir.(NT1|SMB3).opendir # This requires netbios browsing
 ^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$
 ^samba4.smb2.oplock.exclusive2\(.*\)$ # samba 4 oplocks are a mess
 ^samba4.smb2.oplock.exclusive5\(.*\)$ # samba 4 oplocks are a mess
diff --git a/selftest/knownfail.d/libsmbclient b/selftest/knownfail.d/libsmbclient
index dddd6d24920..8d8ef3cbaa2 100644
--- a/selftest/knownfail.d/libsmbclient
+++ b/selftest/knownfail.d/libsmbclient
@@ -1,2 +1,2 @@
-samba4.libsmbclient.readdirplus2.NT1.readdirplus2.*
-samba4.libsmbclient.readdirplus_seek.NT1.readdirplus_seek.*
+samba4.unix_ext.libsmbclient.readdirplus2.NT1.readdirplus2.*
+samba4.unix_ext.libsmbclient.readdirplus_seek.NT1.readdirplus_seek.*
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index ba33cfceab4..5796f828bdd 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -373,7 +373,16 @@ def planlibsmbclienttest(name, testargs, proto):
         testargs + [ "--option=torture:clientprotocol=%s" % proto],
         'samba4')
     plantestsuite_loadlist(
-        "samba4.%s.%s" % (t, proto), env, " ".join(cmdarray))
+        "samba4.unix_ext.%s.%s" % (t, proto), env, " ".join(cmdarray))
+
+    plantestsuite_loadlist(
+        "samba4.non_unix_ext.%s.%s" % (t, proto),
+        env,
+        "(inject=\"${SERVERCONFFILE%/*}/global_inject.conf\"; " +
+        "echo \"unix extensions = no\" > ${inject} ; " +
+        " ".join(cmdarray) +
+        "; > ${inject})")
+
 
 libsmbclient = smbtorture4_testsuites("libsmbclient.")
 protocols = [ 'NT1', 'SMB3' ]