summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-01-09 09:26:57 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-01-09 09:50:11 +1100
commitcb00b58349fbd8c72d1c51e6cacc204c76a70a13 (patch)
tree4b4ebc683c508269c2d5a4dadeda8b56b5e0ca06 /source3
parenteff69aa0f908f5cb44b3cb846c8a4ada874240fa (diff)
downloadsamba-cb00b58349fbd8c72d1c51e6cacc204c76a70a13.tar.gz
samba-cb00b58349fbd8c72d1c51e6cacc204c76a70a13.tar.bz2
samba-cb00b58349fbd8c72d1c51e6cacc204c76a70a13.zip
s3-selftest Hide smb4torture_possible inside plansmbtorturetestsuite()
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/selftest/tests.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index ea14cc6357..006acc1e3d 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -41,10 +41,15 @@ if os.getenv("SELFTEST_QUICK"):
torture_options.append("--option=torture:quick=yes")
smb4torture += " " + " ".join(torture_options)
+sub = subprocess.Popen("%s --version 2> /dev/null" % smb4torture, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
+sub.communicate("")
+smb4torture_possible = (sub.returncode == 0)
+
def plansmbtorturetestsuite(name, env, options, description=''):
modname = "samba3.posix_s3.%s %s" % (name, description)
cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
- plantestsuite_loadlist(modname, env, cmdline)
+ if smb4torture_possible:
+ plantestsuite_loadlist(modname, env, cmdline)
plantestsuite("samba3.blackbox.success", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_success.sh")])
plantestsuite("samba3.blackbox.failure", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_failure.sh")])
@@ -232,10 +237,7 @@ libsmbclient = ["libsmbclient"]
tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt + libsmbclient
-sub = subprocess.Popen("%s --version 2> /dev/null" % smb4torture, stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
-sub.communicate("")
-
-if sub.returncode == 0:
+if smb4torture_possible:
for t in tests:
if t == "base.delaywrite":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')