[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-137-g0f0c851
Andrew Bartlett
abartlet at samba.org
Mon Apr 14 17:34:36 GMT 2008
The branch, v4-0-test has been updated
via 0f0c8519b87481e3473a469cefd51c76b4a7632e (commit)
via 280339e3d126f5c72dc271051b72839fde0c5c9f (commit)
via 524ec0796efebd48e7b5b2eb5fcc92ecc13c0071 (commit)
via 8be7d93735a357a3b73a1c4413d6fd9ec09b7555 (commit)
via 2f19f981449bf6f4d29f231259817c8b66104a9b (commit)
via f610862dc900cb3ddf0f275641bc3b66ad1f3bc4 (commit)
via b191a1953c24545e9dc1869fc33cb29343d4e3f2 (commit)
from 957c4d893acf9e6db06a3fc3a4687ab6bb238635 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 0f0c8519b87481e3473a469cefd51c76b4a7632e
Merge: 280339e3d126f5c72dc271051b72839fde0c5c9f 957c4d893acf9e6db06a3fc3a4687ab6bb238635
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 14 19:32:42 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit 280339e3d126f5c72dc271051b72839fde0c5c9f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Apr 14 19:20:43 2008 +0200
Make sure credentials are specified when running the Python winreg RPC tests.
commit 524ec0796efebd48e7b5b2eb5fcc92ecc13c0071
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Apr 14 19:13:41 2008 +0200
Allow command line options in the subunitrun script.
commit 8be7d93735a357a3b73a1c4413d6fd9ec09b7555
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Apr 14 19:01:32 2008 +0200
Also look in the environment for smb.conf path.
commit 2f19f981449bf6f4d29f231259817c8b66104a9b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Apr 14 18:30:07 2008 +0200
Add convenience TestCase class for testing RPC interfaces.
commit f610862dc900cb3ddf0f275641bc3b66ad1f3bc4
Merge: b191a1953c24545e9dc1869fc33cb29343d4e3f2 8dca5b9bbb8706a98ad9a15f1b479be497dd44e7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 14 18:01:40 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit b191a1953c24545e9dc1869fc33cb29343d4e3f2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 14 17:58:09 2008 +0200
Ensure we initialise s->lp_ctx for the way into the provision.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/libnet/libnet_vampire.c | 2 +
source/scripting/bin/subunitrun | 21 +++++++++++++++++++-
source/scripting/python/samba/getopt.py | 10 +++++---
source/scripting/python/samba/tests/__init__.py | 15 +++++++++----
.../python/samba/tests/dcerpc/registry.py | 9 +++----
source/selftest/samba4_tests.sh | 2 +-
6 files changed, 43 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libnet/libnet_vampire.c b/source/libnet/libnet_vampire.c
index 9d32088..1cc63a3 100644
--- a/source/libnet/libnet_vampire.c
+++ b/source/libnet/libnet_vampire.c
@@ -586,6 +586,8 @@ NTSTATUS libnet_Vampire(struct libnet_context *ctx, TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
+ s->lp_ctx = ctx->lp_ctx;
+
join = talloc_zero(s, struct libnet_JoinDomain);
if (!join) {
return NT_STATUS_NO_MEMORY;
diff --git a/source/scripting/bin/subunitrun b/source/scripting/bin/subunitrun
index 11ac426..fbbffde 100755
--- a/source/scripting/bin/subunitrun
+++ b/source/scripting/bin/subunitrun
@@ -20,6 +20,25 @@
from subunit import SubunitTestRunner
import sys
from unittest import TestProgram
+import optparse
+import os
+import param
+import samba.getopt as options
+import samba.tests
+
+parser = optparse.OptionParser("subunitrun [options] <tests>")
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option_group(options.VersionOptions(parser))
+
+args = parser.parse_args()[1]
+
+samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
+samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
+
+param.cvar.default_config = samba.tests.cmdline_loadparm
runner = SubunitTestRunner()
-TestProgram(module=None, argv=sys.argv, testRunner=runner)
+program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
diff --git a/source/scripting/python/samba/getopt.py b/source/scripting/python/samba/getopt.py
index 82cb004..7ec684a 100644
--- a/source/scripting/python/samba/getopt.py
+++ b/source/scripting/python/samba/getopt.py
@@ -35,12 +35,14 @@ class SambaOptions(optparse.OptionGroup):
self._configfile = arg
def get_loadparm(self):
- import param
+ import os, param
lp = param.LoadParm()
- if self._configfile is None:
- lp.load_default()
- else:
+ if self._configfile is not None:
lp.load(self._configfile)
+ elif os.getenv("SMB_CONF_PATH") is not None:
+ lp.load(os.getenv("SMB_CONF_PATH"))
+ else:
+ lp.load_default()
return lp
class VersionOptions(optparse.OptionGroup):
diff --git a/source/scripting/python/samba/tests/__init__.py b/source/scripting/python/samba/tests/__init__.py
index c8673d3..e29b4a8 100644
--- a/source/scripting/python/samba/tests/__init__.py
+++ b/source/scripting/python/samba/tests/__init__.py
@@ -85,8 +85,13 @@ class LdbExtensionTests(TestCaseInTempDir):
os.unlink(path)
-def get_loadparm():
- import param
- lp = param.LoadParm()
- lp.load(os.getenv("SMB_CONF_PATH"))
- return lp
+cmdline_loadparm = None
+cmdline_credentials = None
+
+class RpcInterfaceTestCase(unittest.TestCase):
+ def get_loadparm(self):
+ assert cmdline_loadparm is not None
+ return cmdline_loadparm
+
+ def get_credentials(self):
+ return cmdline_credentials
diff --git a/source/scripting/python/samba/tests/dcerpc/registry.py b/source/scripting/python/samba/tests/dcerpc/registry.py
index 147acc5..05ac7c6 100644
--- a/source/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source/scripting/python/samba/tests/dcerpc/registry.py
@@ -18,14 +18,13 @@
#
import winreg
-from param import LoadParm
import unittest
-from samba.tests import get_loadparm
+from samba.tests import RpcInterfaceTestCase
-class WinregTests(unittest.TestCase):
+class WinregTests(RpcInterfaceTestCase):
def setUp(self):
- lp_ctx = get_loadparm()
- self.conn = winreg.winreg("ncalrpc:", lp_ctx)
+ lp = self.get_loadparm()
+ self.conn = winreg.winreg("ncalrpc:", lp, self.get_credentials())
def get_hklm(self):
return self.conn.OpenHKLM(None,
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 7e54566..d52c240 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -342,7 +342,7 @@ plantest "unixinfo.python" dc $SUBUNITRUN samba.tests.dcerpc.unix
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 $SUBUNITRUN samba.tests.dcerpc.rpcecho
-plantest "winreg.python" dc $SUBUNITRUN samba.tests.dcerpc.registry
+plantest "winreg.python" dc $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
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
--
Samba Shared Repository
More information about the samba-cvs
mailing list