selftest: Move some tests to common test script.

diff --git a/selftest/tests.py b/selftest/tests.py
index 91caba42023c3ac86c4ff0ccfcbb73c6b54adeb7..d9ad9e96619c3e10797118c5d2c4887664b75d72 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -21,3 +21,5 @@
 from selftesthelpers import *
 
 planpythontestsuite("none", "samba.tests.source")
+planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
+planpythontestsuite("none", "subunit")

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 756b28c4e0c97d2b9b6804b933550a967d02287e..d99c4b0513790d0a36ffa90b5d4fa40fc7892a89 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -417,7 +417,6 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
         name = module
     plantestsuite(name, env, args)
 
-planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
 planpythontestsuite("none", "api", name="ldb.python", extra_path=['lib/ldb/tests/python'])
 planpythontestsuite("none", "samba.tests.credentials")
 planoldpythontestsuite("dc:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'])
@@ -450,7 +449,6 @@ planpythontestsuite("dc:local", "samba.tests.samba_tool.user")
 planpythontestsuite("dc:local", "samba.tests.samba_tool.group")
 planpythontestsuite("plugin_s4_dc:local", "samba.tests.samba_tool.ntacl")
 
-planpythontestsuite("none", "subunit")
 planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
 planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
 planoldpythontestsuite("dc:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])