python: Fix rpcecho tests.

(This used to be commit ebb78ea4232c1614755844849580e3697b0a53fa)

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
index f569f013dc6eb572b898a9c9604b00e5bc162ac3..266a092788e820465dd39f2049841cf95a876f1e 100644 (file)
--- 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 5972027f5928fe859919f74ef6baee30802806a0..9a1c5b1b6461a2dab6b9b5063fb9e19c029a2a58 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/source4/torture/rpc/echo.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
similarity index 89%
rename from source4/torture/rpc/echo.py
rename to source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 47b71c9e15bdc475092c059b208acad5d1441688..cedd0cc2fee538aa4b04e6155b61639e2d1ac9f2 100644 (file)
--- 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 14b51c60543f581e32a6048a1e1d543506546ee7..c1dac21614d86608245e9d402cb6b5dc00d7b69e 100755 (executable)
--- 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