sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-17 05:44:20 +03:00
Code Activity

s3-selftest Hide smb4torture_possible inside plansmbtorturetestsuite()

Browse Source
This commit is contained in:
Andrew Bartlett
2012-01-09 09:26:57 +11:00
parent eff69aa0f9
commit cb00b58349
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source3/selftest/tests.py
View File

@@ -41,10 +41,15 @@ if os.getenv("SELFTEST_QUICK"):
torture_options.append("--option=torture:quick=yes") torture_options.append("--option=torture:quick=yes")
smb4torture += " " + " ".join(torture_options) 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=''): def plansmbtorturetestsuite(name, env, options, description=''):
modname = "samba3.posix_s3.%s %s" % (name, description) modname = "samba3.posix_s3.%s %s" % (name, description)
cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name) 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.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")]) 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 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) if smb4torture_possible:
sub.communicate("")
if sub.returncode == 0:
for t in tests: for t in tests:
if t == "base.delaywrite": if t == "base.delaywrite":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900') plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')