From b38ad5e383c056d61dffa7df075d8e6c8bbf13ac Mon Sep 17 00:00:00 2001
From: stroeder <stroeder>
Date: Wed, 26 Apr 2017 11:14:25 +0000
Subject: [PATCH] by default back-mdb is now used for slapd-based tests

---
 CHANGES        | 4 +++-
 Tests/slapd.py | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index cd87e0d..1f14622 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
@@ -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 $
diff --git a/Tests/slapd.py b/Tests/slapd.py
index 07f92e7..6ac027c 100644
--- a/Tests/slapd.py
+++ b/Tests/slapd.py
@@ -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
@@ -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)
@@ -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),
@@ -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')