s4-selftest: Move more tests to scripting/python, simplifies running of tests.

9 files changed, 12 insertions, 14 deletions

diff --git a/source4/auth/tests/bindings.py b/source4/scripting/python/samba/tests/auth.py
index 6ecfc2047f..6ecfc2047f 100644
--- a/source4/auth/tests/bindings.py
+++ b/source4/scripting/python/samba/tests/auth.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/source4/scripting/python/samba/tests/dcerpc/__init__.py
index 9e198460a3..b6bf830304 100644
--- a/source4/scripting/python/samba/tests/dcerpc/__init__.py
+++ b/source4/scripting/python/samba/tests/dcerpc/__init__.py
@@ -3,12 +3,12 @@
 
 # Unix SMB/CIFS implementation.
 # Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
-#   
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-#   
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/source4/scripting/python/samba/tests/dcerpc/misc.py
index 3526d74dee..689cea360c 100644
--- a/source4/scripting/python/samba/tests/dcerpc/misc.py
+++ b/source4/scripting/python/samba/tests/dcerpc/misc.py
@@ -43,8 +43,8 @@ class GUIDTests(samba.tests.TestCase):
         guid2 = misc.GUID(text1)
         self.assertEquals(0, cmp(guid1, guid2))
         self.assertEquals(guid1, guid2)
-         
-        
+
+
 class PolicyHandleTests(samba.tests.TestCase):
 
     def test_init(self):
diff --git a/source4/auth/gensec/tests/bindings.py b/source4/scripting/python/samba/tests/gensec.py
index 21e3fa379a..21e3fa379a 100644
--- a/source4/auth/gensec/tests/bindings.py
+++ b/source4/scripting/python/samba/tests/gensec.py
diff --git a/source4/lib/messaging/tests/bindings.py b/source4/scripting/python/samba/tests/messaging.py
index 91cf024555..91cf024555 100644
--- a/source4/lib/messaging/tests/bindings.py
+++ b/source4/scripting/python/samba/tests/messaging.py
diff --git a/source4/param/tests/bindings.py b/source4/scripting/python/samba/tests/param.py
index 34d6544e3c..34d6544e3c 100644
--- a/source4/param/tests/bindings.py
+++ b/source4/scripting/python/samba/tests/param.py
diff --git a/source4/lib/registry/tests/bindings.py b/source4/scripting/python/samba/tests/registry.py
index d01ebff909..d01ebff909 100644
--- a/source4/lib/registry/tests/bindings.py
+++ b/source4/scripting/python/samba/tests/registry.py
diff --git a/source4/libcli/security/tests/bindings.py b/source4/scripting/python/samba/tests/security.py
index 22f7df6b1c..22f7df6b1c 100644
--- a/source4/libcli/security/tests/bindings.py
+++ b/source4/scripting/python/samba/tests/security.py
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 596604b627..b3bb85dd34 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -104,7 +104,7 @@ planpythontestsuite() {
 	env=$2
 	module="$3"
 	shift 3
-	plantestsuite_idlist "$name" "$env" PYTHONPATH=$samba4srcdir/../lib/subunit/python:$samba4srcdir/../lib/testtools $PYTHON -m subunit.run $module
+	plantestsuite_idlist "$name" "$env" PYTHONPATH=$PYTHONPATH:$samba4srcdir/../lib/subunit/python:$samba4srcdir/../lib/testtools $PYTHON -m subunit.run $module
 }
 
 plansmbtorturetestsuite() {
@@ -175,8 +175,6 @@ do
 	plansmbtorturetestsuite "$t" dc "-U\$USERNAME%\$PASSWORD" //\$SERVER_IP/_none_
 done
 
-# only do the ldb tests when not in quick mode - they are quite slow, and ldb
-# is now pretty well tested by the rest of the quick tests anyway
 LDBDIR=$samba4srcdir/lib/ldb
 export LDBDIR
 # Don't run LDB tests when using system ldb, as we won't have ldbtest installed
@@ -498,13 +496,13 @@ fi
 SUBUNITRUN="$VALGRIND $PYTHON $samba4srcdir/scripting/bin/subunitrun"
 plantestsuite "ldb.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/ldb/tests/python/" $PYTHON $samba4srcdir/lib/ldb/tests/python/api.py
 plantestsuite "credentials.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/auth/credentials/tests" $SUBUNITRUN bindings
-plantestsuite "gensec.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/auth/gensec/tests" $SUBUNITRUN bindings
-plantestsuite "registry.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/registry/tests/" $SUBUNITRUN bindings
+planpythontestsuite "gensec.python" none samba.tests.gensec
+planpythontestsuite "registry.python" none samba.tests.registry
 plantestsuite "tdb.python" none PYTHONPATH="$PYTHONPATH:../lib/tdb/python/tests" $SUBUNITRUN simple
-plantestsuite "auth.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/auth/tests/" $SUBUNITRUN bindings
-plantestsuite "security.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/libcli/security/tests" $SUBUNITRUN bindings
-plantestsuite "misc.python" none $SUBUNITRUN samba.tests.dcerpc.misc
-plantestsuite "param.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/param/tests" $SUBUNITRUN bindings
+planpythontestsuite "auth.python" none samba.tests.auth
+planpythontestsuite "security.python" none samba.tests.security
+planpythontestsuite "misc.python" none samba.tests.dcerpc.misc
+planpythontestsuite "param.python" none samba.tests.param
 planpythontestsuite "upgrade.python" none samba.tests.upgrade
 planpythontestsuite "samba.python" none samba.tests
 planpythontestsuite "provision.python" none samba.tests.provision
@@ -517,7 +515,7 @@ planpythontestsuite "unixinfo.python" dc:local samba.tests.dcerpc.unix
 planpythontestsuite "rpc_talloc.python" none samba.tests.dcerpc.rpc_talloc
 planpythontestsuite "samdb.python" none samba.tests.samdb
 planpythontestsuite "shares.python" none samba.tests.shares
-plantestsuite "messaging.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/messaging/tests" $SUBUNITRUN bindings
+planpythontestsuite "messaging.python" none samba.tests.messaging
 plantestsuite "samba3sam.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
 planpythontestsuite "subunit.python" none subunit
 planpythontestsuite "rpcecho.python" dc:local samba.tests.dcerpc.rpcecho