lib/texpect: prefer bsd/libutil.h if available

[obnox/samba/samba-obnox.git] / selftest / tests.py

diff --git a/selftest/tests.py b/selftest/tests.py
index aebfc57630c3c3429007fce09bf01400f2211e33..dcf48a20c430fc00d8a9511940e9f0400d2af587 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -37,7 +37,12 @@ if have_man_pages_support:
     planpythontestsuite("none", "samba.tests.docs")
 
 planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
-planpythontestsuite("none", "subunit")
+try:
+    import testscenarios
+except ImportError:
+    skiptestsuite("subunit", "testscenarios not available")
+else:
+    planpythontestsuite("none", "subunit.tests.test_suite")
 planpythontestsuite("none", "samba.tests.blackbox.ndrdump")
 planpythontestsuite("none", "api", name="ldb.python", extra_path=['lib/ldb/tests/python'])
 planpythontestsuite("none", "samba.tests.credentials")
@@ -54,16 +59,41 @@ planpythontestsuite("none", "samba.tests.samba3")
 planpythontestsuite("none", "samba.tests.strings")
 planpythontestsuite("none", "samba.tests.netcmd")
 planpythontestsuite("none", "samba.tests.dcerpc.rpc_talloc")
-planpythontestsuite("none", "samba.tests.samdb")
 planpythontestsuite("none", "samba.tests.hostconfig")
-planpythontestsuite("none", "samba.tests.messaging")
+planpythontestsuite("dc:local", "samba.tests.messaging")
 planpythontestsuite("none", "samba.tests.samba3sam")
-planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
-plantestsuite("samba4.blackbox.dbcheck.alpha13", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'alpha13', configuration])
-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])
-plantestsuite("samba4.blackbox.upgradeprovision.alpha13", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), '$PREFIX_ABS/provision', 'alpha13', configuration])
-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])
+planpythontestsuite(
+    "none", "wafsamba.tests.test_suite",
+    extra_path=[os.path.join(samba4srcdir, "..", "buildtools"),
+                os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
+plantestsuite(
+    "samba4.blackbox.dbcheck.alpha13", "none",
+    ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"),
+     '$PREFIX_ABS/provision', 'alpha13', configuration])
+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])
+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])
+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])
+plantestsuite(
+    "samba4.blackbox.upgradeprovision.alpha13", "none",
+    ["PYTHON=%s" % python,
+     os.path.join(bbdir, "upgradeprovision-oldrelease.sh"),
+     '$PREFIX_ABS/provision', 'alpha13', configuration])
+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])
 planpythontestsuite("none", "samba.tests.upgradeprovision")
 planpythontestsuite("none", "samba.tests.xattr")
 planpythontestsuite("none", "samba.tests.ntacls")
 planpythontestsuite("none", "samba.tests.policy")
+plantestsuite("wafsamba.duplicate_symbols", "none", [os.path.join(srcdir(), "buildtools/wafsamba/test_duplicate_symbol.sh")])