summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-10-12 21:11:22 -0700
committerAndrew Bartlett <abartlet@samba.org>2014-10-14 06:44:07 +0200
commit23ac8d130c1f476fda5d984531266a6c210c2982 (patch)
treefab44577f4675b5e95c0b7cbf1f9f676c5a047c6 /python
parent7043a8b62a7093764f92bcd098df72a844139f7d (diff)
downloadsamba-23ac8d130c1f476fda5d984531266a6c210c2982.tar.gz
samba-23ac8d130c1f476fda5d984531266a6c210c2982.tar.xz
samba-23ac8d130c1f476fda5d984531266a6c210c2982.zip
urgent_replication: Use subunit reporting, remove allow_empty_output.
Change-Id: I6d479b218eff6c4292fbb99e4760bbd62ce1f380 Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r--python/samba/tests/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 2df30a641b..8d3b4dd152 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -166,8 +166,9 @@ class BlackboxTestCase(TestCase):
raise BlackboxProcessError(retcode, line, p.stdout.read(), p.stderr.read())
return p.stdout.read()
+
def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None,
- flags=0, ldb_options=None, ldap_only=False):
+ flags=0, ldb_options=None, ldap_only=False, global_schema=True):
"""Create SamDB instance and connects to samdb_url database.
:param samdb_url: Url for database to connect to.
@@ -176,6 +177,7 @@ def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None,
:param credentials: Optional credentials, defaults to anonymous.
:param flags: Optional LDB flags
:param ldap_only: If set, only remote LDAP connection will be created.
+ :param global_schema: Whether to use global schema.
Added value for tests is that we have a shorthand function
to make proper URL for ldb.connect() while using default
@@ -207,7 +209,8 @@ def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None,
session_info=session_info,
credentials=credentials,
flags=flags,
- options=ldb_options)
+ options=ldb_options,
+ global_schema=global_schema)
def connect_samdb_ex(samdb_url, lp=None, session_info=None, credentials=None,