sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

selftest: Add support for setting ENV variables in plantestsuite()

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2021-07-27 13:45:03 +02:00 committed by Andreas Schneider
parent 3db299e586
commit 48289b6964
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
selftest/selftesthelpers.py
View File

@ -66,7 +66,7 @@ def valgrindify(cmdline):
return valgrind + " " + cmdline return valgrind + " " + cmdline
def plantestsuite(name, env, cmdline): def plantestsuite(name, env, cmd, environ={}):
"""Plan a test suite. """Plan a test suite.
:param name: Testsuite name :param name: Testsuite name
@ -80,8 +80,18 @@ def plantestsuite(name, env, cmdline):
fullname = "%s(%s)" % (name, env) fullname = "%s(%s)" % (name, env)
print(fullname) print(fullname)
print(env) print(env)
if isinstance(cmdline, list):
cmdline = " ".join(cmdline) cmdline = ""
if environ:
environ = dict(environ)
cmdline_env = ["%s=%s" % item for item in environ.items()]
cmdline = " ".join(cmdline_env) + " "
if isinstance(cmd, list):
cmdline += " ".join(cmd)
else:
cmdline += cmd
if "$LISTOPT" in cmdline: if "$LISTOPT" in cmdline:
raise AssertionError("test %s supports --list, but not --load-list" % name) raise AssertionError("test %s supports --list, but not --load-list" % name)
print(cmdline + " 2>&1 " + " | " + add_prefix(name, env)) print(cmdline + " 2>&1 " + " | " + add_prefix(name, env))
@ -182,14 +192,17 @@ smbtorture4_options = [
] + get_env_torture_options() ] + get_env_torture_options()
def plansmbtorture4testsuite(name, env, options, target, environ={}, modname=None): def plansmbtorture4testsuite(name, env, options, target, modname=None, environ={}):
if modname is None: if modname is None:
modname = "samba4.%s" % name modname = "samba4.%s" % name
if isinstance(options, list): if isinstance(options, list):
options = " ".join(options) options = " ".join(options)
options = " ".join(smbtorture4_options + ["--target=%s" % target]) + " " + options options = " ".join(smbtorture4_options + ["--target=%s" % target]) + " " + options
cmdline = ["%s=%s" % item for item in environ.items()] cmdline = ""
cmdline += "%s $LISTOPT $LOADLIST %s %s" % (valgrindify(smbtorture4), options, name) if environ:
environ = dict(environ)
cmdline = ["%s=%s" % item for item in environ.items()]
cmdline += " %s $LISTOPT $LOADLIST %s %s" % (valgrindify(smbtorture4), options, name)
plantestsuite_loadlist(modname, env, cmdline) plantestsuite_loadlist(modname, env, cmdline)