sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

Fix samdb test and enable it.

Browse Source 
(This used to be commit 6b202d3780)
This commit is contained in:
Jelmer Vernooij
2008-05-29 17:38:12 +02:00
parent e16f0e15b4
commit 6f7b2b6933
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source4/samba4-skip
View File

@ -49,6 +49,5 @@ samba4.ntvfs.cifs.raw.
^samba4.net.api.become.dc.*$ # Fails ^samba4.net.api.become.dc.*$ # Fails
nss.test # Fails nss.test # Fails
samba4.samba3sam.python # Conversion from EJS not yet finished samba4.samba3sam.python # Conversion from EJS not yet finished
samba4.samdb.python # Not finished yet
raw.offline # Samba 4 doesn't have much offline support yet raw.offline # Samba 4 doesn't have much offline support yet
winreg* #Does not authenticate against the target server winreg* #Does not authenticate against the target server

8
source4/scripting/python/samba/tests/samdb.py
View File

@ -19,7 +19,7 @@
from samba.auth import system_session from samba.auth import system_session
from samba.credentials import Credentials from samba.credentials import Credentials
import os import os
from samba.provision import setup_samdb, guess_names from samba.provision import setup_samdb, guess_names, setup_templatesdb
from samba.samdb import SamDB from samba.samdb import SamDB
from samba.tests import cmdline_loadparm, TestCaseInTempDir from samba.tests import cmdline_loadparm, TestCaseInTempDir
from samba import security from samba import security
@ -42,12 +42,16 @@ class SamDBTestCase(TestCaseInTempDir):
domainsid = security.random_sid() domainsid = security.random_sid()
hostguid = str(uuid.uuid4()) hostguid = str(uuid.uuid4())
path = os.path.join(self.tempdir, "samdb.ldb") path = os.path.join(self.tempdir, "samdb.ldb")
session_info = system_session()
names = guess_names(lp=cmdline_loadparm, hostname="foo", names = guess_names(lp=cmdline_loadparm, hostname="foo",
domain="EXAMPLE.COM", dnsdomain="example.com", domain="EXAMPLE.COM", dnsdomain="example.com",
serverrole="domain controller", serverrole="domain controller",
domaindn=self.domaindn, configdn=configdn, domaindn=self.domaindn, configdn=configdn,
schemadn=schemadn) schemadn=schemadn)
self.samdb = setup_samdb(path, setup_path, system_session(), creds, setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"),
setup_path, session_info=session_info,
credentials=creds, lp=cmdline_loadparm)
self.samdb = setup_samdb(path, setup_path, session_info, creds,
cmdline_loadparm, names, cmdline_loadparm, names,
lambda x: None, domainsid, lambda x: None, domainsid,
"# no aci", domainguid, "# no aci", domainguid,

2
source4/selftest/samba4_tests.sh
View File

@ -340,8 +340,8 @@ plantest "provision.python" none $SUBUNITRUN samba.tests.provision
plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3 plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
plantest "samr.python" dc $SUBUNITRUN samba.tests.dcerpc.sam plantest "samr.python" dc $SUBUNITRUN samba.tests.dcerpc.sam
plantest "dcerpc.bare.python" dc $SUBUNITRUN samba.tests.dcerpc.bare plantest "dcerpc.bare.python" dc $SUBUNITRUN samba.tests.dcerpc.bare
plantest "samdb.python" dc $SUBUNITRUN samba.tests.samdb
plantest "unixinfo.python" dc $SUBUNITRUN samba.tests.dcerpc.unix plantest "unixinfo.python" dc $SUBUNITRUN samba.tests.dcerpc.unix
plantest "samdb.python" none $SUBUNITRUN samba.tests.samdb
plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests
plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:lib/messaging/tests" $SUBUNITRUN bindings plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:lib/messaging/tests" $SUBUNITRUN bindings
plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam