SQUASH tests.py

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index baa6a5fc9092e92b5022a81bca9e652e27f9d9c8..79b010cf1445214beff4ad7d0a9d44b4e35e5eea 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -46,7 +46,7 @@ smb4torture += " " + " ".join(torture_options)
 try:
     config_h = os.environ["CONFIG_H"]
 except KeyError:
-    config_h = os.path.join.(bindir(), "default/include/config.h")
+    config_h = os.path.join(bindir(), "default/include/config.h")
 
 f = open(config_h, 'r')
 try:
@@ -112,8 +112,6 @@ tests=["--ping", "--separator",
 for t in tests:
     plantestsuite("samba3.wbinfo_s3.(s3dc:local).%s" % t, "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
     plantestsuite("samba3.wbinfo_s3.(member:local).%s" % t, "member:local", [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
-    if with_cluster_support:
-        plantestsuite("samba3.wbinfo_s3.(clusteredmember:local).%s" % t, "clusteredmember:local", [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
 
 for env in localmemberenvs:
     plantestsuite(
@@ -141,7 +139,7 @@ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, en
 for env in ["s3dc"]:
     plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration])
 
-for env in ["member"]:
+for env in memberenvs:
     plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration])
 
 for env in ["s3dc"]: