sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s4-test-delete_object.py: Use common implementation for connect_samdb()

Browse Source 
Connections are restricted to LDAP only (remote),
as this test can't be run against local LDBs
This commit is contained in:
Kamen Mazdrashki 2010-09-29 03:00:18 +03:00
parent 7acbb7346f
commit 98e4d2702a
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source4/torture/drs/python/delete_object.py
View File

@ -54,10 +54,10 @@ class DrsDeleteObjectTestCase(samba.tests.TestCase):
# connect to DCs singleton
if self.ldb_dc1 is None:
DrsDeleteObjectTestCase.dc1 = get_env_var("DC1")
DrsDeleteObjectTestCase.ldb_dc1 = connect_samdb(self.dc1)
DrsDeleteObjectTestCase.ldb_dc1 = samba.tests.connect_samdb(self.dc1, ldap_only=True)
if self.ldb_dc2 is None:
DrsDeleteObjectTestCase.dc2 = get_env_var("DC2")
DrsDeleteObjectTestCase.ldb_dc2 = connect_samdb(self.dc2)
DrsDeleteObjectTestCase.ldb_dc2 = samba.tests.connect_samdb(self.dc2, ldap_only=True)
# fetch rootDSEs
if self.info_dc1 is None:
@ -215,21 +215,3 @@ def get_env_var(var_name):
if not var_name in os.environ.keys():
raise AssertionError("Please supply %s in environment" % var_name)
return os.environ[var_name]
def connect_samdb(samdb_url):
ldb_options = []
if not "://" in samdb_url:
if os.path.isfile(samdb_url):
samdb_url = "tdb://%s" % samdb_url
else:
samdb_url = "ldap://%s" % samdb_url
# use 'paged_search' module when connecting remotely
if samdb_url.lower().startswith("ldap://"):
ldb_options = ["modules:paged_searches"]
return SamDB(url=samdb_url,
lp=samba.tests.env_loadparm(),
session_info=system_session(),
credentials=samba.tests.cmdline_credentials,
options=ldb_options)