Store logs and keep failed run data on failure

mistotebe · mistotebe · commit 1a4d7274e37c · 2025-12-01T10:42:33.000Z
diff --git a/Lib/slapdtest/_slapdtest.py b/Lib/slapdtest/_slapdtest.py
@@ -407,12 +407,17 @@ def _start_slapd(self):
             '-F', self._slapd_conf,
             '-h', ' '.join(urls),
         ]
+        stderr = None
         if self._log.isEnabledFor(logging.DEBUG):
             slapd_args.extend(['-d', '-1'])
+            stderr = os.open(os.path.join(self.testrundir, 'slapd.log'), os.O_WRONLY|os.O_CREAT)
         else:
             slapd_args.extend(['-d', '0'])
         self._log.info('starting slapd: %r', ' '.join(slapd_args))
-        self._proc = subprocess.Popen(slapd_args)
+        self._proc = subprocess.Popen(slapd_args, stderr=stderr)
+        if stderr is not None:
+            os.close(stderr)
+            stderr = None
         # Waits until the LDAP server socket is open, or slapd crashed
         deadline = time.monotonic() + 10
         # no cover to avoid spurious coverage changes, see
@@ -452,15 +457,16 @@ def start(self):
                 self._proc.pid, self.ldap_uri, self.ldapi_uri
             )
 
-    def stop(self):
+    def stop(self, cleanup=True):
         """
         Stops the slapd server, and waits for it to terminate and cleans up
         """
         if self._proc is not None:
             self._log.debug('stopping slapd with pid %d', self._proc.pid)
             self._proc.terminate()
             self.wait()
-        self._cleanup_rundir()
+        if cleanup:
+            self._cleanup_rundir()
         atexit.unregister(self.stop)
 
     def restart(self):
@@ -588,7 +594,7 @@ def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
-        self.stop()
+        self.stop(exc_type is None)
 
 
 class SlapdTestCase(unittest.TestCase):
@@ -617,4 +623,4 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        cls.server.stop()
+        cls.server.stop(False)
