samdb/cracknames: support user and service principal as desired format

[sfrench/samba-autobuild/.git] / selftest / selftesthelpers.py

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index aa1d2b31b5a1ab67355e31a46e3c629cd162f885..8b885b59419cb27f1a76633c0e31edaf5f27f2ea 100644 (file)
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -34,22 +34,9 @@ def source3dir():
 def bindir():
     return os.path.normpath(os.getenv("BINDIR", "./bin"))
 
-binary_mapping = {}
-
 def binpath(name):
-    if name in binary_mapping:
-        name = binary_mapping[name]
     return os.path.join(bindir(), name)
 
-binary_mapping_string = os.getenv("BINARY_MAPPING", None)
-if binary_mapping_string is not None:
-    for binmapping_entry in binary_mapping_string.split(','):
-        try:
-            (from_path, to_path) = binmapping_entry.split(':', 1)
-        except ValueError:
-            continue
-        binary_mapping[from_path] = to_path
-
 # Split perl variable to allow $PERL to be set to e.g. "perl -W"
 perl = os.getenv("PERL", "perl").split()
 
@@ -59,6 +46,7 @@ else:
     has_perl_test_more = False
 
 python = os.getenv("PYTHON", "python")
+extra_python = os.getenv("EXTRA_PYTHON", None)
 
 tap2subunit = python + " " + os.path.join(srcdir(), "selftest", "tap2subunit")
 
@@ -79,7 +67,11 @@ def plantestsuite(name, env, cmdline):
     :param cmdline: Command line to run
     """
     print "-- TEST --"
-    print name
+    if env == "none":
+        fullname = name
+    else:
+        fullname = "%s(%s)" % (name, env)
+    print fullname
     print env
     if isinstance(cmdline, list):
         cmdline = " ".join(cmdline)
@@ -137,7 +129,7 @@ def planperltestsuite(name, path):
         skiptestsuite(name, "Test::More not available")
 
 
-def planpythontestsuite(env, module, name=None, extra_path=[]):
+def planpythontestsuite(env, module, name=None, extra_path=[], py3_compatible=False):
     if name is None:
         name = module
     pypath = list(extra_path)
@@ -145,6 +137,10 @@ def planpythontestsuite(env, module, name=None, extra_path=[]):
     if pypath:
         args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath))
     plantestsuite_loadlist(name, env, args)
+    if py3_compatible and extra_python is not None:
+        # Plan one more test for Python 3 compatible module
+        args[0] = extra_python
+        plantestsuite_loadlist(name + ".python3", env, args)
 
 
 def get_env_torture_options():
@@ -161,11 +157,12 @@ samba3srcdir = source3dir()
 bbdir = os.path.join(srcdir(), "testprogs/blackbox")
 configuration = "--configfile=$SMB_CONF_PATH"
 
-smbtorture4 = binpath("smbtorture4")
+smbtorture4 = binpath("smbtorture")
 smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
 
 smbtorture4_options = [
     configuration,
+    "--option=\'fss:sequence timeout=1\'",
     "--maximum-runtime=$SELFTEST_MAXTIME",
     "--basedir=$SELFTEST_TMPDIR",
     "--format=subunit"
@@ -186,12 +183,16 @@ def smbtorture4_testsuites(prefix):
     return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
 
 
-smbclient3 = binpath('smbclient3')
+smbclient3 = binpath('smbclient')
 smbtorture3 = binpath('smbtorture3')
-ntlm_auth3 = binpath('ntlm_auth3')
+ntlm_auth3 = binpath('ntlm_auth')
 net = binpath('net')
 scriptdir = os.path.join(srcdir(), "script/tests")
 
 wbinfo = binpath('wbinfo')
 dbwrap_tool = binpath('dbwrap_tool')
 vfstest = binpath('vfstest')
+smbcquotas = binpath('smbcquotas')
+smbget = binpath('smbget')
+rpcclient = binpath('rpcclient')
+smbcacls = binpath('smbcacls')