Revert "s4:python fixed subunit tests of dcerpc"

This reverts commit ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2.

diff --git a/source4/scripting/python/samba/tests/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
similarity index 100%
rename from source4/scripting/python/samba/tests/bare.py
rename to source4/scripting/python/samba/tests/dcerpc/bare.py

diff --git a/source4/scripting/python/samba/tests/misc.py b/source4/scripting/python/samba/tests/dcerpc/misc.py
similarity index 100%
rename from source4/scripting/python/samba/tests/misc.py
rename to source4/scripting/python/samba/tests/dcerpc/misc.py

diff --git a/source4/scripting/python/samba/tests/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
similarity index 100%
rename from source4/scripting/python/samba/tests/registry.py
rename to source4/scripting/python/samba/tests/dcerpc/registry.py

diff --git a/source4/scripting/python/samba/tests/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
similarity index 100%
rename from source4/scripting/python/samba/tests/rpcecho.py
rename to source4/scripting/python/samba/tests/dcerpc/rpcecho.py

diff --git a/source4/scripting/python/samba/tests/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
similarity index 100%
rename from source4/scripting/python/samba/tests/sam.py
rename to source4/scripting/python/samba/tests/dcerpc/sam.py

diff --git a/source4/scripting/python/samba/tests/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
similarity index 100%
rename from source4/scripting/python/samba/tests/unix.py
rename to source4/scripting/python/samba/tests/dcerpc/unix.py

diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 4689b69c94fe36cc3c9efd1efb393d95f3be8a7f..e301a39674b26461fd853d1b45580ad6bbfc9582 100755 (executable)
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -433,22 +433,22 @@ plantest "registry.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/regist
 plantest "tdb.python" none PYTHONPATH="$PYTHONPATH:../lib/tdb/python/tests" $SUBUNITRUN simple
 plantest "auth.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/auth/tests/" $SUBUNITRUN bindings
 plantest "security.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/libcli/security/tests" $SUBUNITRUN bindings
-plantest "misc.python" none $SUBUNITRUN samba.tests.misc
+plantest "misc.python" none $SUBUNITRUN samba.tests.dcerpc.misc
 plantest "param.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/param/tests" $SUBUNITRUN bindings
 plantest "upgrade.python" none $SUBUNITRUN samba.tests.upgrade
 plantest "samba.python" none $SUBUNITRUN samba.tests
 plantest "provision.python" none $SUBUNITRUN samba.tests.provision
 plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
-plantest "samr.python" dc:local $SUBUNITRUN samba.tests.sam
-plantest "dcerpc.bare.python" dc:local $SUBUNITRUN samba.tests.bare
-plantest "unixinfo.python" dc:local $SUBUNITRUN samba.tests.unix
+plantest "samr.python" dc:local $SUBUNITRUN samba.tests.dcerpc.sam
+plantest "dcerpc.bare.python" dc:local $SUBUNITRUN samba.tests.dcerpc.bare
+plantest "unixinfo.python" dc:local $SUBUNITRUN samba.tests.dcerpc.unix
 plantest "samdb.python" none $SUBUNITRUN samba.tests.samdb
 plantest "shares.python" none $SUBUNITRUN samba.tests.shares
 plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/messaging/tests" $SUBUNITRUN bindings
 plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
 plantest "subunit.python" none $SUBUNITRUN subunit
-plantest "rpcecho.python" dc:local $SUBUNITRUN samba.tests.rpcecho
-plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.registry
+plantest "rpcecho.python" dc:local $SUBUNITRUN samba.tests.dcerpc.rpcecho
+plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
 plantest "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
 plantest "ldap.possibleInferiors.python" dc $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py $CONFIGURATION ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
 plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/sec_descriptor.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN