s4-selftest: Move samba3sam test to standard python directory.

diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/scripting/python/samba/tests/samba3sam.py
similarity index 100%
rename from source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
rename to source4/scripting/python/samba/tests/samba3sam.py

diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 7d4633a605bb5bb1edd950b22815fd5afea51eec..6ecf9e10aedad9797086e38308a3c23d89b6ae4f 100755 (executable)
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -502,10 +502,10 @@ planpythontestsuite none samba.tests.dcerpc.rpc_talloc
 planpythontestsuite none samba.tests.samdb
 planpythontestsuite none samba.tests.shares
 planpythontestsuite none samba.tests.messaging
-plantestsuite "samba4.samba3sam.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
+planpythontestsuite none samba.tests.samba3sam
 planpythontestsuite none subunit
 planpythontestsuite dc:local samba.tests.dcerpc.rpcecho
-plantestsuite "samba4.winreg.python (dc:local)" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
+plantestsuite_idlist "samba.tests.dcerpc.registry" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
 plantestsuite "samba4.ldap.python (dc)" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/ldap.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
 plantestsuite "samba4.schemaInfo.python (dc)" dc PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/tests/python/" $SUBUNITRUN dsdb_schema_info -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
 plantestsuite "samba4.urgent_replication.python (dc)" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/urgent_replication.py \$PREFIX_ABS/dc/private/sam.ldb