The branch, master has been updated via a47970c Add tests for srvsvc python interface. Thanks Dhananjay Sathe via 8878949 selftest: Some extra assertions. from 86338ab dbcheck: cope with objects disappearing during checking
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a47970cae60bde303f126299fa9930a2f25cc165 Author: Jelmer Vernooij <jel...@samba.org> Date: Thu Dec 8 02:42:28 2011 +0100 Add tests for srvsvc python interface. Thanks Dhananjay Sathe Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Thu Dec 8 04:57:52 CET 2011 on sn-devel-104 commit 8878949ff5d8261657f950ec1c372e35aae7c8de Author: Jelmer Vernooij <jel...@samba.org> Date: Thu Dec 8 02:42:08 2011 +0100 selftest: Some extra assertions. ----------------------------------------------------------------------- Summary of changes: .../scripting/python/samba/tests/dcerpc/srvsvc.py | 69 ++++++++++++++++++++ source4/selftest/tests.py | 5 ++ 2 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 source4/scripting/python/samba/tests/dcerpc/srvsvc.py Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/tests/dcerpc/srvsvc.py b/source4/scripting/python/samba/tests/dcerpc/srvsvc.py new file mode 100644 index 0000000..eaaf420 --- /dev/null +++ b/source4/scripting/python/samba/tests/dcerpc/srvsvc.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Unix SMB/CIFS implementation. +# Copyright © Dhananjay Sathe <dhanajaysa...@gmail.com> 2011 +# Copyright © Jelmer Vernooij <jel...@samba.org> 2011 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +"""Tests for samba.dcerpc.srvsvc.""" + +from samba.dcerpc import srvsvc +from samba.tests import RpcInterfaceTestCase + + +class SrvsvcTests(RpcInterfaceTestCase): + + def setUp(self): + super(SrvsvcTests, self).setUp() + self.conn = srvsvc.srvsvc("ncalrpc:", self.get_loadparm()) + self.server_unc = "\\\\." + + def getDummyShareObject(self): + share = srvsvc.NetShareInfo2() + + share.name = u'test' + share.comment = u'test share' + share.type = srvsvc.STYPE_DISKTREE + share.current_users = 0x00000000 + share.max_users = -1 + share.password = None + share.path = u'C:\\tmp' # some random path + share.permissions = 123434566 + return share + + def test_NetShareAdd(self): + self.skip("Dangerous test") + share = self.getDummyShareObject() + self.conn.NetShareAdd(self.server_unc, 2, share, None) + + def test_NetShareSetInfo(self): + self.skip("Dangerous test") + share = self.getDummyShareObject() + parm_error = 0x00000000 + self.conn.NetShareAdd(self.server_unc, 502, share, parm_error) + name = share.name + share.comment = "now sucessfully modified " + parm_error = self.pipe.NetShareSetInfo(self.server_unc, name, + 502, share, parm_error) + + def test_NetShareDel(self): + self.skip("Dangerous test") + share = self.getDummyShareObject() + parm_error = 0x00000000 + self.expectFailure("NetShareAdd doesn't work properly from Python", + self.conn.NetShareAdd, self.server_unc, 502, share, parm_error) + self.conn.NetShareDel(self.server_unc, share.name, 0) diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 370bce3..9bb622b 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -131,6 +131,8 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]: tests = ncacn_np_tests elif transport == "ncacn_ip_tcp": tests = ncacn_ip_tcp_tests + else: + raise AssertionError("invalid transport %r"% transport) for t in tests: plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions)) plansmbtorturetestsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions)) @@ -157,6 +159,8 @@ for transport in ["ncacn_np", "ncacn_ip_tcp"]: tests = slow_ncacn_np_tests elif transport == "ncacn_ip_tcp": tests = slow_ncacn_ip_tcp_tests + else: + raise AssertionError("Invalid transport %r" % transport) for t in tests: plansmbtorturetestsuite(t, env, ["%s:$SERVER" % transport, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s" % (t, transport)) @@ -423,6 +427,7 @@ planpythontestsuite("dc:local", "samba.tests.dsdb") planpythontestsuite("none", "samba.tests.netcmd") planpythontestsuite("dc:local", "samba.tests.dcerpc.bare") planpythontestsuite("dc:local", "samba.tests.dcerpc.unix") +planpythontestsuite("dc:local", "samba.tests.dcerpc.srvsvc") planpythontestsuite("none", "samba.tests.dcerpc.rpc_talloc") planpythontestsuite("none", "samba.tests.samdb") planpythontestsuite("none", "samba.tests.hostconfig") -- Samba Shared Repository