selftest: Slightly simplify setting up libsmbclient tests

We'll add per-test arguments soon

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): Tue Feb 25 19:30:27 UTC 2020 on sn-devel-184

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 59251d95433375183ed3a61f6b2fa69c9264048f..5cdb3d27b77c5602e66bd0e4fc6ac2b42f734f2c 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -372,14 +372,20 @@ for t in libsmbclient:
     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()
+        ]
+
     for proto in protocols:
-        libsmbclient_testargs = ["--option=torture:smburl=" + url,
-                                 "--option=torture:replace_smbconf=%s/testdata/samba3/smb_new.conf" % srcdir(),
-                                 "--option=torture:clientprotocol=%s" % proto]
         plansmbtorture4testsuite(
             t,
             "nt4_dc",
-            ['//$SERVER/tmp', '-U$USERNAME%$PASSWORD'] + libsmbclient_testargs,
+            libsmbclient_testargs +
+            [ "--option=torture:clientprotocol=%s" % proto],
             "samba4.%s.%s" % (t, proto))
 
 plansmbtorture4testsuite("raw.qfileinfo.ipc", "ad_dc_ntvfs", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')