diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 16:38:24 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 18:19:03 +0200 |
| commit | 51058213cb183bcb127f5bb275cbb781efc55e35 (patch) | |
| tree | cdf9394eaba7e5ab2e784cd18518770469f99075 /source4/scripting/python/samba/tests/provision.py | |
| parent | 46037a816091506c4c89df6141d57b281728b395 (diff) | |
| download | samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.gz samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.xz samba-51058213cb183bcb127f5bb275cbb781efc55e35.zip | |
s4-test: Use smb.conf path set in environment rather than using
command-line options.
This is the first step towards supporting custom test runners.
Diffstat (limited to 'source4/scripting/python/samba/tests/provision.py')
| -rw-r--r-- | source4/scripting/python/samba/tests/provision.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index 45c237f373e..22e4553f027 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -20,10 +20,9 @@ import os from samba.provision import setup_secretsdb, findnss import samba.tests +from samba.tests import env_loadparm import unittest -lp = samba.tests.cmdline_loadparm - setup_dir = "setup" def setup_path(file): return os.path.join(setup_dir, file) @@ -34,7 +33,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir): """ def test_setup_secretsdb(self): path = os.path.join(self.tempdir, "secrets.ldb") - ldb = setup_secretsdb(path, setup_path, None, None, lp=lp) + ldb = setup_secretsdb(path, setup_path, None, None, lp=env_loadparm()) try: self.assertEquals("LSA Secrets", ldb.searchone(basedn="CN=LSA Secrets", attribute="CN")) |