diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2019-02-15 22:15:23 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-21 04:09:19 +0100 |
commit | e051d787f4d69536581e1e2ad9f6c54ab882537a (patch) | |
tree | e353a70bc4328858d0a76e6889eca12b29d214c9 /selftest/tests.py | |
parent | fa8a8483651b4c5a4c337d23714f16d47e7d6ad0 (diff) | |
download | samba-e051d787f4d69536581e1e2ad9f6c54ab882537a.tar.gz |
selftest/tests: add helper method to simplify plantestsuite
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/tests.py')
-rw-r--r-- | selftest/tests.py | 87 |
1 files changed, 53 insertions, 34 deletions
diff --git a/selftest/tests.py b/selftest/tests.py index 89e5ff43507..2d223046a95 100644 --- a/selftest/tests.py +++ b/selftest/tests.py @@ -91,66 +91,85 @@ planpythontestsuite( "none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "third_party", "waf")]) + + +def cmdline(script, *args): + """ + Prefix PYTHON env var and append --configurefile option to abs script path. + + script.sh arg1 arg2 + --> + PYTHON=python /path/to/bbdir/script.sh arg1 arg2 \ + --configurefile $SMB_CONF_FILE + """ + return [ + "PYTHON=%s" % python, + os.path.join(bbdir, script), + ] + list(args) + [configuration] + + plantestsuite( "samba4.blackbox.demote-saveddb", "none", - ["PYTHON=%s" % python, os.path.join(bbdir, "demote-saveddb.sh"), - '$PREFIX_ABS/demote', configuration]) + cmdline('demote-saveddb.sh', '$PREFIX_ABS/demote')) + plantestsuite( "samba4.blackbox.dbcheck.alpha13", "none", - ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), - '$PREFIX_ABS/provision', 'alpha13', configuration]) + cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + 'alpha13')) + plantestsuite( "samba4.blackbox.dbcheck.release-4-0-0", "none", - ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), - '$PREFIX_ABS/provision', 'release-4-0-0', configuration]) + cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + 'release-4-0-0')) + plantestsuite( "samba4.blackbox.dbcheck.release-4-1-0rc3", "none", - ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), - '$PREFIX_ABS/provision', 'release-4-1-0rc3', configuration]) + cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + 'release-4-1-0rc3')) + plantestsuite( "samba4.blackbox.dbcheck.release-4-1-6-partial-object", "none", - ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), - '$PREFIX_ABS/provision', 'release-4-1-6-partial-object', configuration]) + cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + 'release-4-1-6-partial-object')) + plantestsuite( "samba4.blackbox.dbcheck.release-4-5-0-pre1", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "dbcheck-oldrelease.sh"), - '$PREFIX_ABS/provision', 'release-4-5-0-pre1', configuration]) + cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + 'release-4-5-0-pre1')) + plantestsuite( "samba4.blackbox.upgradeprovision.alpha13", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), - '$PREFIX_ABS/provision', 'alpha13', configuration]) + cmdline('upgradeprovision-oldrelease.sh', '$PREFIX_ABS/provision', + 'alpha13')) + plantestsuite( "samba4.blackbox.upgradeprovision.release-4-0-0", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), - '$PREFIX_ABS/provision', 'release-4-0-0', configuration]) + cmdline('upgradeprovision-oldrelease.sh', '$PREFIX_ABS/provision', + 'release-4-0-0')) + plantestsuite( "samba4.blackbox.tombstones-expunge.release-4-5-0-pre1", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "tombstones-expunge.sh"), - '$PREFIX_ABS/provision', 'release-4-5-0-pre1', configuration]) + cmdline('tombstones-expunge.sh', '$PREFIX_ABS/provision', + 'release-4-5-0-pre1')) + plantestsuite( "samba4.blackbox.dbcheck-links.release-4-5-0-pre1", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "dbcheck-links.sh"), - '$PREFIX_ABS/provision', 'release-4-5-0-pre1', configuration]) + cmdline('dbcheck-links.sh', '$PREFIX_ABS/provision', + 'release-4-5-0-pre1')) + plantestsuite( "samba4.blackbox.runtime-links.release-4-5-0-pre1", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "runtime-links.sh"), - '$PREFIX_ABS/provision', 'release-4-5-0-pre1', configuration]) + cmdline('runtime-links.sh', '$PREFIX_ABS/provision', + 'release-4-5-0-pre1')) + plantestsuite( "samba4.blackbox.schemaupgrade", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "schemaupgrade.sh"), - '$PREFIX_ABS/provision', configuration]) + cmdline('schemaupgrade.sh', '$PREFIX_ABS/provision')) + plantestsuite( "samba4.blackbox.functionalprep", "none", - ["PYTHON=%s" % python, - os.path.join(bbdir, "functionalprep.sh"), - '$PREFIX_ABS/provision', configuration]) + cmdline('functionalprep.sh', '$PREFIX_ABS/provision')) + planpythontestsuite("none", "samba.tests.upgradeprovision", py3_compatible=True) planpythontestsuite("none", "samba.tests.xattr", py3_compatible=True) planpythontestsuite("none", "samba.tests.ntacls", py3_compatible=True) |