Make sure credentials are specified when running the Python winreg RPC tests.

(This used to be commit 280339e3d126f5c72dc271051b72839fde0c5c9f)

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 3730a15e1ba5bca9945580ce1fb524ca8a89aabe..fbbffde42cd5840473c0307a6bbe3d4c6a9f5155 100755 (executable)
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -38,8 +38,7 @@ args = parser.parse_args()[1]
 samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
 samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
 
-import pdb
-pdb.set_trace()
+param.cvar.default_config = samba.tests.cmdline_loadparm
 
 runner = SubunitTestRunner()
 program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)

diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index 1afdc582a7efccbf031e1924c0a057de73069723..05ac7c66ee65677f07560ccb2a3dbb36ecdc4b17 100644 (file)
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -23,8 +23,8 @@ from samba.tests import RpcInterfaceTestCase
 
 class WinregTests(RpcInterfaceTestCase):
     def setUp(self):
-        self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(), 
-                                  self.get_credentials())
+        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/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 7e545664d1ff105c4881506284bef03f970c0a91..d52c240b9328aaecae638e1c3a6cbfa4c9d81090 100755 (executable)
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/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