Add defensive check and improve exception safety in logging restoration

Co-authored-by: bittner <[email protected]>

Author: Copilot

cli_test_helpers/decorators.py

@@ -33,7 +33,8 @@ def _save_logging_handlers(self):
 
     def _restore_logging_handlers(self):
         """Restore previously saved logging handlers."""
-        logging.root.handlers[:] = self._old_handlers
+        if hasattr(self, '_old_handlers'):
+            logging.root.handlers[:] = self._old_handlers
 
 
 class ArgvContext(LoggingIsolationMixin):
@@ -90,9 +91,8 @@ def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        result = super().__exit__(exc_type, exc_val, exc_tb)
         self._restore_logging_handlers()
-        return result
+        return super().__exit__(exc_type, exc_val, exc_tb)
 
 
 class RandomDirectoryContext(LoggingIsolationMixin, TemporaryDirectory):
@@ -120,7 +120,6 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         """Return to the original directory before execution."""
-        os.chdir(self.__prev_dir)
-        result = super().__exit__(exc_type, exc_value, traceback)
         self._restore_logging_handlers()
-        return result
+        os.chdir(self.__prev_dir)
+        return super().__exit__(exc_type, exc_value, traceback)