diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-29 17:38:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-29 17:38:12 +0200 |
| commit | 6f7b2b69333230016a9538b024faec0d97095c69 (patch) | |
| tree | 5b7b5f1326f7338d6e62eb603f6a7601bcb5d78f | |
| parent | e16f0e15b40229e7a42311dddfb391cf6142462e (diff) | |
| download | samba-6f7b2b69333230016a9538b024faec0d97095c69.tar.gz samba-6f7b2b69333230016a9538b024faec0d97095c69.tar.bz2 samba-6f7b2b69333230016a9538b024faec0d97095c69.zip | |
Fix samdb test and enable it.
(This used to be commit 6b202d3780f8ff50e0bdfa4a749c43b5639e4880)
| -rw-r--r-- | source4/samba4-skip | 1 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/samdb.py | 8 | ||||
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/source4/samba4-skip b/source4/samba4-skip index 4ac35a3c78..de572ed41e 100644 --- a/source4/samba4-skip +++ b/source4/samba4-skip @@ -49,6 +49,5 @@ samba4.ntvfs.cifs.raw. ^samba4.net.api.become.dc.*$ # Fails nss.test # Fails 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 winreg* #Does not authenticate against the target server diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py index a022d7bb51..7e8ba053d4 100644 --- a/source4/scripting/python/samba/tests/samdb.py +++ b/source4/scripting/python/samba/tests/samdb.py @@ -19,7 +19,7 @@ from samba.auth import system_session from samba.credentials import Credentials 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.tests import cmdline_loadparm, TestCaseInTempDir from samba import security @@ -42,12 +42,16 @@ class SamDBTestCase(TestCaseInTempDir): domainsid = security.random_sid() hostguid = str(uuid.uuid4()) path = os.path.join(self.tempdir, "samdb.ldb") + session_info = system_session() names = guess_names(lp=cmdline_loadparm, hostname="foo", domain="EXAMPLE.COM", dnsdomain="example.com", serverrole="domain controller", domaindn=self.domaindn, configdn=configdn, 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, lambda x: None, domainsid, "# no aci", domainguid, diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 1771a0da5c..9693451c47 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -340,8 +340,8 @@ plantest "provision.python" none $SUBUNITRUN samba.tests.provision plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3 plantest "samr.python" dc $SUBUNITRUN samba.tests.dcerpc.sam 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 "samdb.python" none $SUBUNITRUN samba.tests.samdb plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:lib/messaging/tests" $SUBUNITRUN bindings plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam |