summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-13 16:38:24 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-13 18:19:03 +0200
commit51058213cb183bcb127f5bb275cbb781efc55e35 (patch)
treecdf9394eaba7e5ab2e784cd18518770469f99075 /source4/lib
parent46037a816091506c4c89df6141d57b281728b395 (diff)
downloadsamba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.gz
samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.bz2
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/lib')
-rwxr-xr-xsource4/lib/ldb/tests/python/dsdb_schema_info.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/lib/ldb/tests/python/dsdb_schema_info.py
index f0c8c14d6d..976d67024a 100755
--- a/source4/lib/ldb/tests/python/dsdb_schema_info.py
+++ b/source4/lib/ldb/tests/python/dsdb_schema_info.py
@@ -198,7 +198,7 @@ systemOnly: FALSE
########################################################################################
if not "DC_SERVER" in os.environ.keys():
- raise AssertionError, "Please supply TARGET_DC in environment"
+ raise AssertionError("Please supply TARGET_DC in environment")
ldb_url = os.environ["DC_SERVER"]
ldb_options = []
@@ -211,7 +211,7 @@ if not "://" in ldb_url:
ldb_options = ["modules:paged_searches"]
ldb = Ldb(url=ldb_url,
- lp=samba.tests.cmdline_loadparm,
+ lp=samba.tests.env_loadparm(),
session_info=system_session(),
credentials=samba.tests.cmdline_credentials,
options=ldb_options)