The branch, master has been updated via 2e259de s4-dsdb/tests/python: Explicitly pass comamnd line LoadParm() instance to system_session() from 4a1ce3b s4-dns: implemented parsing and storing of DNS records from bind
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2e259de0849becd73a76841186c303984feff083 Author: Kamen Mazdrashki <kame...@samba.org> Date: Wed Dec 15 15:16:54 2010 +0200 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 <kame...@samba.org> Autobuild-Date: Wed Dec 15 15:10:47 CET 2010 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source4/dsdb/tests/python/acl.py | 2 +- source4/dsdb/tests/python/deletetest.py | 2 +- source4/dsdb/tests/python/ldap.py | 4 ++-- source4/dsdb/tests/python/ldap_schema.py | 2 +- source4/dsdb/tests/python/ldap_syntaxes.py | 2 +- source4/dsdb/tests/python/passwords.py | 2 +- source4/dsdb/tests/python/sam.py | 2 +- source4/dsdb/tests/python/sec_descriptor.py | 2 +- source4/dsdb/tests/python/urgent_replication.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index d336fa9..85018b0 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 4ed125d..9125795 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 f23de8d..810289e 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 64da563..3dcbb72 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 54198d7..63296c8 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 e43298e..28a0776 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 9e50c62..4242fd6 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 f6454bb..c24b6e9 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 88cef4d..946d7d7 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() -- Samba Shared Repository