Merge 43c0e4d into 20cadea

.travis.yml

@@ -25,5 +25,5 @@ install:
 script:
   - ./bin/test
 after_success:
-  - bin/createcoverage
+  - bin/coverage run --source=./src/node/ext/ldap bin/test
   - bin/coveralls

CHANGES.rst

@@ -4,7 +4,8 @@ History
 1.0b5 (unreleased)
 ------------------
 
-- No changes yet.
+- make db-type in test layer configurable
+  [jensens]
 
 
 1.0b4 (2017-06-07)

src/node/ext/ldap/testing/__init__.py

@@ -19,6 +19,7 @@
 SCHEMA = os.environ.get('SCHEMA')
 SLAPDBIN = os.environ.get('SLAPD_BIN', 'slapd')
 SLAPDURIS = os.environ.get('SLAPD_URIS', 'ldap://127.0.0.1:12345')
+SLAPDDB = os.environ.get('SLAPD_DB', 'bdb')  # or 'mdb'
 LDAPADDBIN = os.environ.get('LDAP_ADD_BIN', 'ldapadd')
 LDAPDELETEBIN = os.environ.get('LDAP_DELETE_BIN', 'ldapdelete')
 LDAPSUFFIX = os.environ.get('LDAP_SUFFIX', None) or "dc=my-domain,dc=com"
@@ -43,6 +44,7 @@ def read_env(layer):
     layer['binddn'] = "cn=Manager,%s" % LDAPSUFFIX
     layer['suffix'] = LDAPSUFFIX
     layer['bindpw'] = "secret"
+    layer['slapddb'] = SLAPDDB
     print tmpdir
 
 
@@ -60,7 +62,7 @@ def read_env(layer):
 #      figure out.
 sizelimit   3
 
-database    bdb
+database    %(slapddb)s
 suffix      "%(suffix)s"
 rootdn      "%(binddn)s"
 rootpw      %(bindpw)s
@@ -95,6 +97,7 @@ def setUp(self, args=None):
         confdir = self['confdir']
         dbdir = self['dbdir']
         slapdconf = self['slapdconf']
+        slapddb = self['slapddb']
         schema = '\n'.join(
             ["include %s" % (schema,) for schema in self.schema]
         )
@@ -108,6 +111,7 @@ def setUp(self, args=None):
                     dbdir=dbdir,
                     schema=schema,
                     suffix=suffix,
+                    slapddb=slapddb,
                 )
             )
         os.mkdir(dbdir)