diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 23:30:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 23:30:17 +0200 |
| commit | 91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab (patch) | |
| tree | 08bf467f32dd6ad38b2d4323910f5a88c68ffa42 /source4/scripting/python/samba/tests/samdb.py | |
| parent | b1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e (diff) | |
| parent | 1b5f32128d1867829647a4e1f20b6e8363444f66 (diff) | |
| download | samba-91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab.tar.gz samba-91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab.tar.xz samba-91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 0239011ced6c864f85b47a342438228a8f6940ee)
Diffstat (limited to 'source4/scripting/python/samba/tests/samdb.py')
| -rw-r--r-- | source4/scripting/python/samba/tests/samdb.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py index 3745dba6fc2..0e175bf936a 100644 --- a/source4/scripting/python/samba/tests/samdb.py +++ b/source4/scripting/python/samba/tests/samdb.py @@ -21,7 +21,7 @@ from credentials import Credentials import os from samba.provision import setup_samdb from samba.samdb import SamDB -from samba.tests import get_loadparm, TestCaseInTempDir +from samba.tests import cmdline_loadparm, TestCaseInTempDir import security from unittest import TestCase import uuid @@ -43,7 +43,7 @@ class SamDBTestCase(TestCaseInTempDir): hostguid = uuid.random() path = os.path.join(self.tempdir, "samdb.ldb") self.samdb = setup_samdb(path, setup_path, system_session(), creds, - get_loadparm(), schemadn, configdn, + cmdline_loadparm, schemadn, configdn, self.domaindn, "example.com", "EXAMPLE.COM", "FOO", lambda x: None, "foo", domaindn, False, domainsid, "# no aci", domainguid, |