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

selftesthelpers: Add function for printing smbtorture4 version.

Browse Source
This commit is contained in:
Jelmer Vernooij 2012-10-26 13:51:54 -08:00
parent 8237e2727d
commit 58345820c0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selftest/selftesthelpers.py
View File

@ -203,12 +203,22 @@ smbtorture4_options = [
] + get_env_torture_options()
def print_smbtorture4_version():
"""Print the version of Samba smbtorture4 comes from.
:return: Whether smbtorture4 was successfully run
"""
sub = subprocess.Popen([smbtorture4, "-V"], stdout=sys.stderr)
sub.communicate("")
return (sub.returncode == 0)
def plansmbtorture4testsuite(name, env, options, target, modname=None):
if modname is None:
modname = "samba4.%s" % name
if isinstance(options, list):
options = " ".join(options)
options += " " + " ".join(smbtorture4_options + ["--target=%s" % target])
options = " ".join(smbtorture4_options + ["--target=%s" % target]) + " " + options
cmdline = "%s $LISTOPT %s %s" % (valgrindify(smbtorture4), options, name)
plantestsuite_loadlist(modname, env, cmdline)

5
source3/selftest/tests.py
View File

@ -21,7 +21,6 @@
import os, sys
sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "../../selftest")))
from selftesthelpers import *
import subprocess
samba3srcdir = srcdir() + "/source3"
scriptdir = os.path.join(samba3srcdir, "../script/tests")
@ -47,9 +46,7 @@ torture_options.extend(get_env_torture_options())
smbtorture4 += " " + " ".join(torture_options)
sub = subprocess.Popen("%s --version 2> /dev/null" % smbtorture4, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
sub.communicate("")
smbtorture4_possible = (sub.returncode == 0)
smbtorture4_possible = print_smbtorture4_version()
def plansmbtorturetestsuite(name, env, options, description=''):

3
source4/selftest/tests.py
View File

@ -22,7 +22,6 @@ import os, sys
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../selftest"))
import selftesthelpers
from selftesthelpers import *
import subprocess
print >>sys.stderr, "OPTIONS %s" % " ".join(smbtorture4_options)
@ -41,7 +40,7 @@ else:
nmblookup = binpath('nmblookup4')
smbclient = binpath('smbclient4')
subprocess.call([smbtorture4, "-V"], stdout=sys.stderr)
print_smbtorture4_version()
bbdir = os.path.join(srcdir(), "testprogs/blackbox")