summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-12-15 15:16:54 +0200
committerKamen Mazdrashki <kamenim@samba.org>2010-12-15 15:10:47 +0100
commit2e259de0849becd73a76841186c303984feff083 (patch)
treebcef7103a30693923c72b1f8a8e3ca50f2c45431 /source4
parent4a1ce3b4b9173ebce7982e675b9f68fe58455ea0 (diff)
downloadsamba-2e259de0849becd73a76841186c303984feff083.tar.gz
samba-2e259de0849becd73a76841186c303984feff083.tar.bz2
samba-2e259de0849becd73a76841186c303984feff083.zip
s4-dsdb/tests/python: Explicitly pass comamnd line LoadParm() instance to system_session()
Otherwise system_session() creates a LoadParm() instance which resets certain global parameters to their defaults from smb.conf ("log level" for instance) Autobuild-User: Kamen Mazdrashki <kamenim@samba.org> Autobuild-Date: Wed Dec 15 15:10:47 CET 2010 on sn-devel-104
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/dsdb/tests/python/acl.py2
-rwxr-xr-xsource4/dsdb/tests/python/deletetest.py2
-rwxr-xr-xsource4/dsdb/tests/python/ldap.py4
-rwxr-xr-xsource4/dsdb/tests/python/ldap_schema.py2
-rw-r--r--source4/dsdb/tests/python/ldap_syntaxes.py2
-rwxr-xr-xsource4/dsdb/tests/python/passwords.py2
-rwxr-xr-xsource4/dsdb/tests/python/sam.py2
-rwxr-xr-xsource4/dsdb/tests/python/sec_descriptor.py2
-rwxr-xr-xsource4/dsdb/tests/python/urgent_replication.py2
9 files changed, 10 insertions, 10 deletions
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index d336fa9f43..85018b0a4d 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -1518,7 +1518,7 @@ class AclExtendedTests(AclTests):
if not "://" in host:
host = "ldap://%s" % host
-ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp)
+ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp)
runner = SubunitTestRunner()
rc = 0
diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index 4ed125dd8f..9125795998 100755
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -379,7 +379,7 @@ if not "://" in host:
else:
host = "ldap://%s" % host
-ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp)
+ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp)
runner = SubunitTestRunner()
rc = 0
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index f23de8dbe6..810289e22c 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2647,10 +2647,10 @@ if not "://" in host:
else:
host = "ldap://%s" % host
-ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp)
+ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp)
if not "tdb://" in host:
gc_ldb = Ldb("%s:3268" % host, credentials=creds,
- session_info=system_session(), lp=lp)
+ session_info=system_session(lp), lp=lp)
else:
gc_ldb = None
diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index 64da563e22..3dcbb72a02 100755
--- a/source4/dsdb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
@@ -567,7 +567,7 @@ if host.startswith("ldap://"):
# user 'paged_search' module when connecting remotely
ldb_options = ["modules:paged_searches"]
-ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp, options=ldb_options)
+ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp, options=ldb_options)
runner = SubunitTestRunner()
rc = 0
diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py
index 54198d7fc4..63296c8616 100644
--- a/source4/dsdb/tests/python/ldap_syntaxes.py
+++ b/source4/dsdb/tests/python/ldap_syntaxes.py
@@ -376,7 +376,7 @@ name: """ + object_name + """
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
pass
-ldb = samba.tests.connect_samdb(host, credentials=creds, session_info=system_session(), lp=lp)
+ldb = samba.tests.connect_samdb(host, credentials=creds, session_info=system_session(lp), lp=lp)
runner = SubunitTestRunner()
rc = 0
if not runner.run(unittest.makeSuite(SyntaxTests)).wasSuccessful():
diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index e43298e34d..28a0776524 100755
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -919,7 +919,7 @@ if not "://" in host:
else:
host = "ldap://%s" % host
-ldb = SamDB(url=host, session_info=system_session(), credentials=creds, lp=lp)
+ldb = SamDB(url=host, session_info=system_session(lp), credentials=creds, lp=lp)
# Gets back the basedn
base_dn = ldb.domain_dn()
diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 9e50c62a50..4242fd6c63 100755
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -2363,7 +2363,7 @@ if not "://" in host:
else:
host = "ldap://%s" % host
-ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp)
+ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp)
runner = SubunitTestRunner()
rc = 0
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index f6454bbcf1..c24b6e9898 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -1862,7 +1862,7 @@ if host.lower().startswith("ldap://"):
ldb = SamDB(host,
credentials=creds,
- session_info=system_session(),
+ session_info=system_session(lp),
lp=lp,
options=ldb_options)
diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index 88cef4dfad..946d7d7f34 100755
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -369,7 +369,7 @@ if not "://" in host:
host = "ldap://%s" % host
-ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp,
+ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp,
global_schema=False)
runner = SubunitTestRunner()