summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-04 18:07:04 +1000
committerAndrew Tridgell <tridge@samba.org>2009-09-04 18:07:04 +1000
commitffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2 (patch)
treecce100c575538ed5557261894509b641571a4084
parent8995491f59e7b6cee79b4249424e886f54f6b94d (diff)
downloadsamba-ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2.tar.gz
samba-ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2.tar.bz2
samba-ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2.zip
s4:python fixed subunit tests of dcerpc
The version of the unitest python module in Ubuntu Jaunty doesn't seem to support this many level of subdirectories. Moving the tests up one level solves the problem.
-rw-r--r--source4/scripting/python/samba/tests/bare.py (renamed from source4/scripting/python/samba/tests/dcerpc/bare.py)0
-rw-r--r--source4/scripting/python/samba/tests/misc.py (renamed from source4/scripting/python/samba/tests/dcerpc/misc.py)0
-rw-r--r--source4/scripting/python/samba/tests/registry.py (renamed from source4/scripting/python/samba/tests/dcerpc/registry.py)0
-rw-r--r--source4/scripting/python/samba/tests/rpcecho.py (renamed from source4/scripting/python/samba/tests/dcerpc/rpcecho.py)0
-rw-r--r--source4/scripting/python/samba/tests/sam.py (renamed from source4/scripting/python/samba/tests/dcerpc/sam.py)0
-rw-r--r--source4/scripting/python/samba/tests/unix.py (renamed from source4/scripting/python/samba/tests/dcerpc/unix.py)0
-rwxr-xr-xsource4/selftest/tests.sh12
7 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/bare.py
index cd939b8098..cd939b8098 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source4/scripting/python/samba/tests/bare.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/source4/scripting/python/samba/tests/misc.py
index e9b5127a5a..e9b5127a5a 100644
--- a/source4/scripting/python/samba/tests/dcerpc/misc.py
+++ b/source4/scripting/python/samba/tests/misc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/registry.py
index 526b2340cc..526b2340cc 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/registry.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/rpcecho.py
index 12638e2397..12638e2397 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/rpcecho.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/sam.py
index 50e00a3f9e..50e00a3f9e 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/sam.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/unix.py
index aa47b71b16..aa47b71b16 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/unix.py
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 525179189b..dd5bf6dfaf 100755
--- 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.dcerpc.misc
+plantest "misc.python" none $SUBUNITRUN samba.tests.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.dcerpc.sam
-plantest "dcerpc.bare.python" dc:local $SUBUNITRUN samba.tests.dcerpc.bare
-plantest "unixinfo.python" dc:local $SUBUNITRUN samba.tests.dcerpc.unix
+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 "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.dcerpc.rpcecho
-plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
+plantest "rpcecho.python" dc:local $SUBUNITRUN samba.tests.rpcecho
+plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.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 "possibleInferiors.python" dc $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py $CONFIGURATION ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3