Make SlapdObject.root_dn a property

jdufresne · encukou · commit 06be5eb9acd0 · 2018-03-27T11:28:09.000+02:00
Allows overriding SlapdObject.suffix or SlapdObject.root_cn without also requiring root_dn be defined. It is now computed from the existing values at runtime. The result is an easier to use SlapdObject class. python-ldap#195
diff --git a/Lib/slapdtest/_slapdtest.py b/Lib/slapdtest/_slapdtest.py
@@ -169,7 +169,6 @@ class SlapdObject(object):
     database = 'mdb'
     suffix = 'dc=slapd-test,dc=python-ldap,dc=org'
     root_cn = 'Manager'
-    root_dn = 'cn=%s,%s' % (root_cn, suffix)
     root_pw = 'password'
     slapd_loglevel = 'stats stats2'
     local_host = '127.0.0.1'
@@ -232,6 +231,10 @@ def __init__(self):
         self.clientcert = os.path.join(HERE, 'certs/client.pem')
         self.clientkey = os.path.join(HERE, 'certs/client.key')
 
+    @property
+    def root_dn(self):
+        return 'cn={self.root_cn},{self.suffix}'.format(self=self)
+
     def _find_commands(self):
         self.PATH_LDAPADD = self._find_command('ldapadd')
         self.PATH_LDAPDELETE = self._find_command('ldapdelete')
