From: Volker Lendecke <vl@samba.org>
Date: Sun, 1 Mar 2020 15:47:27 +0000 (+0100)
Subject: selftest: run libsmbclient unix ext tests against "posix_share"
X-Git-Tag: ldb-2.2.0~1521
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfa01af749aa54e7630a3a9343cc7992664e900a;p=thirdparty%2Fsamba.git

selftest: run libsmbclient unix ext tests against "posix_share"

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

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 5796f828bdd..3cd79470a95 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -367,34 +367,43 @@ for t in base + raw + smb2 + netapi:
 
 def planlibsmbclienttest(name, testargs, proto):
     env = "nt4_dc"
+
+    url = "--option=torture:smburl=smb://$USERNAME:$PASSWORD@$SERVER"
+
     cmdarray = selftesthelpers.smbtorture4testsuite_cmdarray(
         name,
         env,
         testargs + [ "--option=torture:clientprotocol=%s" % proto],
         'samba4')
+
+    urloption = url
+    if name != "libsmbclient.list_shares":
+        urloption += "/posix_share"
+
     plantestsuite_loadlist(
-        "samba4.unix_ext.%s.%s" % (t, proto), env, " ".join(cmdarray))
+        "samba4.unix_ext.%s.%s" % (t, proto),
+        env,
+        " ".join(cmdarray + [urloption]))
+
+    urloption = url
+    if name != "libsmbclient.list_shares":
+        urloption += "/tmp"
 
     plantestsuite_loadlist(
         "samba4.non_unix_ext.%s.%s" % (t, proto),
         env,
         "(inject=\"${SERVERCONFFILE%/*}/global_inject.conf\"; " +
         "echo \"unix extensions = no\" > ${inject} ; " +
-        " ".join(cmdarray) +
+        " ".join(cmdarray + [urloption]) +
         "; > ${inject})")
 
 
 libsmbclient = smbtorture4_testsuites("libsmbclient.")
 protocols = [ 'NT1', 'SMB3' ]
 for t in libsmbclient:
-    url = "smb://$USERNAME:$PASSWORD@$SERVER/tmp"
-    if t == "libsmbclient.list_shares":
-        url = "smb://$USERNAME:$PASSWORD@$SERVER"
-
     libsmbclient_testargs = [
         '//$SERVER/tmp',
         '-U$USERNAME%$PASSWORD',
-        "--option=torture:smburl=" + url,
         "--option=torture:replace_smbconf="
         "%s/testdata/samba3/smb_new.conf" % srcdir()
         ]