summaryrefslogtreecommitdiff
path: root/source3/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-10-26 13:51:54 -0800
committerJelmer Vernooij <jelmer@samba.org>2012-10-27 05:16:18 -0800
commit58345820c078f79fe7f67b8e6f947691f7237641 (patch)
treef6b781d20a661a636ea699db6449442a63fa3973 /source3/selftest
parent8237e2727da0d04b82cb3cf644dd337a4c77fe34 (diff)
downloadsamba-58345820c078f79fe7f67b8e6f947691f7237641.tar.gz
samba-58345820c078f79fe7f67b8e6f947691f7237641.tar.bz2
samba-58345820c078f79fe7f67b8e6f947691f7237641.zip
selftesthelpers: Add function for printing smbtorture4 version.
Diffstat (limited to 'source3/selftest')
-rwxr-xr-xsource3/selftest/tests.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index f0f0b8fdd3..6935e89e48 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -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=''):