diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-10-26 13:51:54 -0800 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-10-27 05:16:18 -0800 |
| commit | 58345820c078f79fe7f67b8e6f947691f7237641 (patch) | |
| tree | f6b781d20a661a636ea699db6449442a63fa3973 /selftest | |
| parent | 8237e2727da0d04b82cb3cf644dd337a4c77fe34 (diff) | |
| download | samba-58345820c078f79fe7f67b8e6f947691f7237641.tar.gz samba-58345820c078f79fe7f67b8e6f947691f7237641.tar.bz2 samba-58345820c078f79fe7f67b8e6f947691f7237641.zip | |
selftesthelpers: Add function for printing smbtorture4 version.
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/selftesthelpers.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 40efc1f7ef..ff5bbd7f1f 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -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) |