Skip to content

Commit

Permalink
by default back-mdb is now used for slapd-based tests
Browse files Browse the repository at this point in the history
  • Loading branch information
stroeder committed Apr 26, 2017
1 parent cc5b6c5 commit b38ad5e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Tests/
* re-factored slapd.py, t_cext.py and t_search.py
* set env var LDAPNOINIT=1 in t_cext.py and t_search.py to avoid
interference with locally installed .ldaprc or ldap.conf
* by default back-mdb is now used for slapd-based tests
which requires fairly recent OpenLDAP builds

----------------------------------------------------------------
Released 2.4.35 2017-04-25
Expand Down Expand Up @@ -1388,4 +1390,4 @@ Released 2.0.0pre02 2002-02-01
----------------------------------------------------------------
Released 1.10alpha3 2000-09-19

$Id: CHANGES,v 1.426 2017/04/26 10:46:31 stroeder Exp $
$Id: CHANGES,v 1.427 2017/04/26 11:14:25 stroeder Exp $
6 changes: 4 additions & 2 deletions Tests/slapd.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

# a template string for generating simple slapd.conf file
SLAPD_CONF_TEMPLATE = """
moduleload back_%(database)s
include %(path_schema_core)s
loglevel %(loglevel)s
allow bind_v2
Expand Down Expand Up @@ -79,7 +80,7 @@ class SlapdObject:
server is shut down.
"""

database = 'ldif'
database = 'mdb'
suffix = 'dc=slapd-test,dc=python-ldap,dc=org'
root_cn = 'Manager'
root_dn = 'cn=%s,%s' % (root_cn, suffix)
Expand Down Expand Up @@ -129,7 +130,7 @@ def _generate_slapd_conf(self):
config_dict = {
'path_schema_core': quote(self.PATH_SCHEMA_CORE),
'loglevel': self.slapd_loglevel,
'database': quote(self.database),
'database': self.database,
'directory': quote(self._db_directory),
'suffix': quote(self.suffix),
'rootdn': quote(self.root_dn),
Expand Down Expand Up @@ -236,6 +237,7 @@ def _test_configuration(self):
popen_list = [
self.PATH_SLAPTEST,
"-f", self._slapd_conf,
'-u',
]
if self._log.isEnabledFor(logging.DEBUG):
popen_list.append('-v')
Expand Down

0 comments on commit b38ad5e

Please sign in to comment.