summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-22 22:05:55 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-09-22 22:29:09 -0700
commitcc5b673e18246f35a908152b7c4a8cb0dc3a89f2 (patch)
tree3b1592a9691f14526bba6a1ced5848b716b8c2cc
parent5651f8a9a77c09f585f4ba8ab04fe9968a5432cb (diff)
downloadsamba-cc5b673e18246f35a908152b7c4a8cb0dc3a89f2.tar.gz
samba-cc5b673e18246f35a908152b7c4a8cb0dc3a89f2.tar.bz2
samba-cc5b673e18246f35a908152b7c4a8cb0dc3a89f2.zip
s4-selftest: Move samba3sam test to standard python directory.
-rw-r--r--source4/scripting/python/samba/tests/samba3sam.py (renamed from source4/dsdb/samdb/ldb_modules/tests/samba3sam.py)0
-rwxr-xr-xsource4/selftest/tests.sh4
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/scripting/python/samba/tests/samba3sam.py
index 59b6e5517c..59b6e5517c 100644
--- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
+++ b/source4/scripting/python/samba/tests/samba3sam.py
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 7d4633a605..6ecf9e10ae 100755
--- 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