Tests commands

Author: azmeuk

slapd/__init__.py

@@ -162,17 +162,17 @@ def __init__(
         self.suffix = suffix
         self.root_cn = root_cn
         self.root_pw = root_pw
-        self.local_host = "127.0.0.1"
+        self.hostname = "127.0.0.1"
 
         self._proc = None
-        self._port = port or self._avail_tcp_port()
-        self.server_id = self._port % 4096
+        self.port = port or self._avail_tcpport()
+        self.server_id = self.port % 4096
         self.testrundir = os.path.join(
-            self.TMPDIR, "%s-%d" % (datadir_prefix or "python-ldap-test", self._port)
+            self.TMPDIR, "%s-%d" % (datadir_prefix or "python-ldap-test", self.port)
         )
         self._slapd_conf = os.path.join(self.testrundir, "slapd.d")
         self._db_directory = os.path.join(self.testrundir, "openldap-data")
-        self.ldap_uri = "ldap://%s:%d/" % (host or self.local_host, self._port)
+        self.ldap_uri = "ldap://%s:%d/" % (host or self.hostname, self.port)
         self.debug = debug
         have_ldapi = hasattr(socket, "AF_UNIX")
         if have_ldapi:
@@ -209,14 +209,6 @@ def __exit__(self, exc_type, exc_value, traceback):
     def root_dn(self):
         return "cn={self.root_cn},{self.suffix}".format(self=self)
 
-    @property
-    def hostname(self):
-        return self.local_host
-
-    @property
-    def port(self):
-        return self._port
-
     def _find_commands(self):
         self.PATH_LDAPADD = self._find_command("ldapadd")
         self.PATH_LDAPDELETE = self._find_command("ldapdelete")
@@ -275,13 +267,13 @@ def _cleanup_rundir(self):
         os.rmdir(self.testrundir)
         self.logger.info("cleaned-up %s", self.testrundir)
 
-    def _avail_tcp_port(self):
+    def _avail_tcpport(self):
         """
         find an available port for TCP connection
         """
         sock = socket.socket()
         try:
-            sock.bind((self.local_host, 0))
+            sock.bind((self.hostname, 0))
             port = sock.getsockname()[1]
         finally:
             sock.close()
@@ -367,20 +359,20 @@ def _start_slapd(self):
         self.logger.info("starting slapd: %r", " ".join(slapd_args))
         self._proc = subprocess.Popen(slapd_args)
         deadline = time.monotonic() + 10
-        while True:  # pragma: no cover
-            if self._proc.poll() is not None:
+        while True:
+            if self._proc.poll() is not None:  # pragma: no cover
                 self._stopped()
                 raise RuntimeError("slapd exited before opening port")
             try:
                 self.logger.debug("slapd connection check to %s", self.default_ldap_uri)
                 self.ldapwhoami()
             except RuntimeError:
-                if time.monotonic() >= deadline:
+                if time.monotonic() >= deadline:  # pragma: no cover
                     break
                 time.sleep(0.2)
             else:
                 return
-        raise RuntimeError("slapd did not start properly")
+        raise RuntimeError("slapd did not start properly")  # pragma: no cover
 
     def start(self):
         """
@@ -390,7 +382,6 @@ def start(self):
         if self._proc is not None:
             return
 
-        # prepare directory structure
         atexit.register(self.stop)
         self._cleanup_rundir()
         self.setup_rundir()
@@ -455,7 +446,7 @@ def _cli_auth_args(self):
 
     def _cli_popen(
         self, ldapcommand, extra_args=None, ldap_uri=None, stdin_data=None
-    ):  # pragma: no cover
+    ):
         if ldap_uri is None:
             ldap_uri = self.default_ldap_uri
 

tests/test_slapdobject.py

@@ -1,10 +1,18 @@
 import slapd
 
 
+def test_nominal_case():
+    server = slapd.Slapd()
+    server.start()
+    server.restart()
+    server.stop()
+
+
 def test_context_manager():
     with slapd.Slapd() as server:
         assert server._proc is not None
     assert server._proc is None
+    server.stop()
 
 
 def test_context_manager_after_start():
@@ -14,3 +22,52 @@ def test_context_manager_after_start():
     with server:
         assert server._proc is not None
     assert server._proc is None
+    server.stop()
+
+
+def test_commands():
+    server = slapd.Slapd()
+    server.start()
+    assert (
+        "dn:cn=manager,dc=slapd-test,dc=python-ldap,dc=org\n"
+        == server.ldapwhoami().stdout.decode("utf-8")
+    )
+    ldif = (
+        "dn: dc=slapd-test,dc=python-ldap,dc=org\n"
+        "objectClass: dcObject\n"
+        "objectClass: organization\n"
+        "dc: slapd-test\n"
+        "o: slapd-test\n"
+        "\n"
+        "dn: cn=Manager,dc=slapd-test,dc=python-ldap,dc=org\n"
+        "objectClass: applicationProcess\n"
+        "cn: Manager\n"
+        "\n"
+        "dn: ou=home,dc=slapd-test,dc=python-ldap,dc=org\n"
+        "objectClass: organizationalUnit\n"
+        "ou: home\n"
+    )
+    server.ldapadd(ldif)
+
+    assert (
+        "dn: ou=home,dc=slapd-test,dc=python-ldap,dc=org"
+        in server.slapcat().stdout.decode("utf-8")
+    )
+
+    ldif = (
+        "dn: ou=home,dc=slapd-test,dc=python-ldap,dc=org\n"
+        "changetype: modify\n"
+        "add: description\n"
+        "description: foobar\n"
+    )
+    server.ldapmodify(ldif)
+
+    assert "foobar" in server.slapcat().stdout.decode("utf-8")
+
+    server.ldapdelete("ou=home,dc=slapd-test,dc=python-ldap,dc=org", True)
+    assert (
+        "dn: ou=home,dc=slapd-test,dc=python-ldap,dc=org"
+        not in server.slapcat().stdout.decode("utf-8")
+    )
+
+    server.stop()