sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

selftest: Re-format long lines in selftesthelpers.py

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 08:50:54 +02:00 committed by Andreas Schneider
parent 7fb741b3b1
commit 18976a9568
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
selftest/selftesthelpers.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/python #!/usr/bin/env python3
#
# This script generates a list of testsuites that should be run as part of # This script generates a list of testsuites that should be run as part of
# the Samba 4 test suite. # the Samba 4 test suite.
@ -24,7 +25,8 @@ import sys
def srcdir(): def srcdir():
return os.path.normpath(os.getenv("SRCDIR", os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))) alternate_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
return os.path.normpath(os.getenv("SRCDIR", alternate_path))
def source4dir(): def source4dir():
@ -90,7 +92,8 @@ def add_prefix(prefix, env, support_list=False):
listopt = "$LISTOPT " listopt = "$LISTOPT "
else: else:
listopt = "" listopt = ""
return "%s %s/selftest/filter-subunit %s--fail-on-empty --prefix=\"%s.\" --suffix=\"(%s)\"" % (python, srcdir(), listopt, prefix, env) return ("%s %s/selftest/filter-subunit %s--fail-on-empty --prefix=\"%s.\" --suffix=\"(%s)\"" %
(python, srcdir(), listopt, prefix, env))
def plantestsuite_loadlist(name, env, cmdline): def plantestsuite_loadlist(name, env, cmdline):
@ -108,7 +111,9 @@ def plantestsuite_loadlist(name, env, cmdline):
raise AssertionError("loadlist test %s does not support not --list" % name) raise AssertionError("loadlist test %s does not support not --list" % name)
if "$LOADLIST" not in cmdline: if "$LOADLIST" not in cmdline:
raise AssertionError("loadlist test %s does not support --load-list" % name) raise AssertionError("loadlist test %s does not support --load-list" % name)
print(("%s | %s" % (cmdline.replace("$LOADLIST", ""), add_prefix(name, env, support_list))).replace("$LISTOPT", "--list ")) print(("%s | %s" %
(cmdline.replace("$LOADLIST", ""),
add_prefix(name, env, support_list))).replace("$LISTOPT", "--list "))
print(cmdline.replace("$LISTOPT", "") + " 2>&1 " + " | " + add_prefix(name, env, False)) print(cmdline.replace("$LISTOPT", "") + " 2>&1 " + " | " + add_prefix(name, env, False))
@ -163,7 +168,10 @@ bbdir = os.path.join(srcdir(), "testprogs/blackbox")
configuration = "--configfile=$SMB_CONF_PATH" configuration = "--configfile=$SMB_CONF_PATH"
smbtorture4 = binpath("smbtorture") smbtorture4 = binpath("smbtorture")
smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].decode('utf8').splitlines() smbtorture4_testsuite_list = subprocess.Popen(
[smbtorture4, "--list-suites"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate("")[0].decode('utf8').splitlines()
smbtorture4_options = [ smbtorture4_options = [
configuration, configuration,