summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsource4/dsdb/tests/python/acl.py (renamed from source4/lib/ldb/tests/python/acl.py)0
-rwxr-xr-xsource4/dsdb/tests/python/deletetest.py (renamed from source4/lib/ldb/tests/python/deletetest.py)0
-rwxr-xr-xsource4/dsdb/tests/python/dsdb_schema_info.py (renamed from source4/lib/ldb/tests/python/dsdb_schema_info.py)0
-rwxr-xr-xsource4/dsdb/tests/python/ldap.py (renamed from source4/lib/ldb/tests/python/ldap.py)0
-rwxr-xr-xsource4/dsdb/tests/python/ldap_schema.py (renamed from source4/lib/ldb/tests/python/ldap_schema.py)0
-rwxr-xr-xsource4/dsdb/tests/python/passwords.py (renamed from source4/lib/ldb/tests/python/passwords.py)0
-rwxr-xr-xsource4/dsdb/tests/python/sec_descriptor.py (renamed from source4/lib/ldb/tests/python/sec_descriptor.py)0
-rwxr-xr-xsource4/dsdb/tests/python/urgent_replication.py (renamed from source4/lib/ldb/tests/python/urgent_replication.py)0
-rwxr-xr-xsource4/selftest/tests.sh16
9 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 5bf3ff9b1b..5bf3ff9b1b 100755
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index aa93104c04..aa93104c04 100755
--- a/source4/lib/ldb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py
index ff3c7f9b98..ff3c7f9b98 100755
--- a/source4/lib/ldb/tests/python/dsdb_schema_info.py
+++ b/source4/dsdb/tests/python/dsdb_schema_info.py
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index de8e89b7f8..de8e89b7f8 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index 270e22adb1..270e22adb1 100755
--- a/source4/lib/ldb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
diff --git a/source4/lib/ldb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index fd2ed1c105..fd2ed1c105 100755
--- a/source4/lib/ldb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 8dc77321b4..8dc77321b4 100755
--- a/source4/lib/ldb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
diff --git a/source4/lib/ldb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index 5e9f4ad128..5e9f4ad128 100755
--- a/source4/lib/ldb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 706c01a88c..3f2cb82915 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -493,21 +493,21 @@ plantestsuite "samba3sam.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb
plantestsuite "subunit.python" none $SUBUNITRUN subunit
plantestsuite "rpcecho.python" dc:local $SUBUNITRUN samba.tests.dcerpc.rpcecho
plantestsuite "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
-plantestsuite "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
-plantestsuite "schemaInfo.python" dc PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/ldb/tests/python/" $SUBUNITRUN dsdb_schema_info -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
-plantestsuite "urgent_replication.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/urgent_replication.py \$PREFIX_ABS/dc/private/sam.ldb
+plantestsuite "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/ldap.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+plantestsuite "schemaInfo.python" dc PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/tests/python/" $SUBUNITRUN dsdb_schema_info -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
+plantestsuite "urgent_replication.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/urgent_replication.py \$PREFIX_ABS/dc/private/sam.ldb
for env in "dc" "fl2000dc" "fl2003dc" "fl2008r2dc"; do
- plantestsuite "ldap_schema.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap_schema.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+ plantestsuite "ldap_schema.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/ldap_schema.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantestsuite "ldap.possibleInferiors.python" $env $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
- plantestsuite "ldap.secdesc.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/sec_descriptor.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
- plantestsuite "ldap.acl.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/acl.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
- plantestsuite "ldap.passwords.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/passwords.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+ plantestsuite "ldap.secdesc.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/sec_descriptor.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+ plantestsuite "ldap.acl.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/acl.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+ plantestsuite "ldap.passwords.python" $env PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/passwords.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
done
plantestsuite "upgradeprovisiondc.python" dc:local $SUBUNITRUN samba.tests.upgradeprovisionneeddc
plantestsuite "upgradeprovisionnodc.python" none $SUBUNITRUN samba.tests.upgradeprovision
plantestsuite "xattr.python" none $SUBUNITRUN samba.tests.xattr
plantestsuite "ntacls.python" none $SUBUNITRUN samba.tests.ntacls
-plantestsuite "deletetest.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/deletetest.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+plantestsuite "deletetest.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/dsdb/tests/python/deletetest.py \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantestsuite "policy.python" none PYTHONPATH="$PYTHONPATH:lib/policy/tests/python" $SUBUNITRUN bindings
plantestsuite "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade