summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-09-29 03:00:18 +0300
committerKamen Mazdrashki <kamenim@samba.org>2010-10-03 01:24:56 +0300
commit98e4d2702aa98d0cf89d3240276f2b5d6e841d45 (patch)
tree5e8bc269748fcfa48d8d67b1477cf35ef36f951a
parent7acbb7346fdf96f25b3c465dd070b86694beb12b (diff)
downloadsamba-98e4d2702aa98d0cf89d3240276f2b5d6e841d45.tar.gz
samba-98e4d2702aa98d0cf89d3240276f2b5d6e841d45.tar.bz2
samba-98e4d2702aa98d0cf89d3240276f2b5d6e841d45.zip
s4-test-delete_object.py: Use common implementation for connect_samdb()
Connections are restricted to LDAP only (remote), as this test can't be run against local LDBs
-rw-r--r--source4/torture/drs/python/delete_object.py22
1 files changed, 2 insertions, 20 deletions
diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py
index 09126dcd01..fb944456bc 100644
--- a/source4/torture/drs/python/delete_object.py
+++ b/source4/torture/drs/python/delete_object.py
@@ -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)
-