diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-14 03:59:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-14 19:53:06 +0100 |
| commit | db4ee4cce5f1fd84f3f0a331e769a70394126ca5 (patch) | |
| tree | c8092699c9c0be394e77c98ea1570ab719c7ebba | |
| parent | d5903fd75e9640831f0e78fc04d3ffa5ea3b1b4a (diff) | |
| download | samba-db4ee4cce5f1fd84f3f0a331e769a70394126ca5.tar.gz samba-db4ee4cce5f1fd84f3f0a331e769a70394126ca5.tar.bz2 samba-db4ee4cce5f1fd84f3f0a331e769a70394126ca5.zip | |
python: Fix rpcecho tests.
(This used to be commit ebb78ea4232c1614755844849580e3697b0a53fa)
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/Python.pm | 4 | ||||
| -rw-r--r-- | source4/scripting/python/STATUS | 5 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/dcerpc/__init__.py | 0 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/dcerpc/rpcecho.py (renamed from source4/torture/rpc/echo.py) | 6 | ||||
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm index f569f013dc..266a092788 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -491,8 +491,8 @@ sub Interface($$$) $self->indent; $self->pidl("$interface->{NAME}_InterfaceObject *ret;"); $self->pidl("const char *binding_string;"); - $self->pidl("struct cli_credentials *credentials;"); - $self->pidl("struct loadparm_context *lp_ctx;"); + $self->pidl("struct cli_credentials *credentials = NULL;"); + $self->pidl("struct loadparm_context *lp_ctx = NULL;"); $self->pidl("TALLOC_CTX *mem_ctx = NULL;"); $self->pidl("NTSTATUS status;"); $self->pidl(""); diff --git a/source4/scripting/python/STATUS b/source4/scripting/python/STATUS index 5972027f59..9a1c5b1b64 100644 --- a/source4/scripting/python/STATUS +++ b/source4/scripting/python/STATUS @@ -9,11 +9,6 @@ DCE/RPC bindings Parse::Pidl::Samba::Python - wrap struct/bitmap/enum/union types - __ndr_pack__/__ndr_unpack__ members - Parse::Pidl::Samba::NDR::Python - - pidl generated client fns - - one class per interface - - AddOne() - - scripting/bin/smbstatus.py - scripting/bin/winreg.py diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/source4/scripting/python/samba/tests/dcerpc/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/source4/scripting/python/samba/tests/dcerpc/__init__.py diff --git a/source4/torture/rpc/echo.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py index 47b71c9e15..cedd0cc2fe 100644 --- a/source4/torture/rpc/echo.py +++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py @@ -17,12 +17,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from echo import rpcecho +import echo import unittest class RpcEchoTests(unittest.TestCase): def setUp(self): - self.conn = rpcecho("ncalrpc:") + self.conn = echo.rpcecho("ncalrpc:") def test_addone(self): self.assertEquals(2, conn.AddOne(1)) @@ -35,5 +35,5 @@ class RpcEchoTests(unittest.TestCase): def test_surrounding(self): somearray = [1,2,3,4] - (y) = conn.TestSurrounding(echo.Surrounding(4, somearray))) + (y,) = conn.TestSurrounding(echo.Surrounding(4, somearray)) self.assertEquals(8 * [0], y.surrounding) diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 14b51c6054..c1dac21614 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -322,7 +322,7 @@ then plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3 plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam - plantest "rpcecho.python" dc PYTHONPATH="$PYTHONPATH:torture/rpc" $SUBUNITRUN echo + plantest "rpcecho.python" dc $SUBUNITRUN samba.tests.dcerpc.rpcecho plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3 rm -rf $PREFIX/upgrade |