Add return self to __enter__ and clean up test code

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

Author: Copilot

cli_test_helpers/decorators.py

@@ -36,6 +36,7 @@ def __enter__(self):
         sys.argv = self.args
         self._old_handlers = logging.root.handlers[:]
         logging.root.handlers.clear()
+        return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         sys.argv = self._old

tests/test_decorators.py

@@ -34,50 +34,38 @@ def test_argv_context_logging_isolation():
     allowing code under test to call logging.basicConfig() successfully even
     when test frameworks have already configured logging.
     """
-    # Setup: Create a mock handler to simulate pytest's handlers
     original_handlers = logging.root.handlers[:]
     mock_handler = logging.NullHandler()
     logging.root.handlers.append(mock_handler)
 
     try:
-        # Verify the mock handler is present
         assert mock_handler in logging.root.handlers, "Test setup failed"
 
         with tempfile.TemporaryDirectory() as tmpdir:
             logfile = Path(tmpdir) / "test.log"
 
             with ArgvContext("test_script.py", str(logfile)):
-                # Inside context: handlers should be cleared
                 handlers_before = logging.root.handlers[:]
                 assert len(handlers_before) == 0, (
                     "Handlers should be cleared inside ArgvContext"
                 )
 
-                # Configure logging (this should work now)
-                logging.basicConfig(
-                    filename=str(logfile),
-                    level=logging.INFO,
-                    force=False,  # Should work without force since handlers are cleared
-                )
+                logging.basicConfig(filename=str(logfile), level=logging.INFO)
 
-                # Log a message
                 logger = logging.getLogger(__name__)
                 logger.info("Test message")
 
-            # After context: handlers should be restored
             assert mock_handler in logging.root.handlers, (
                 "Original handlers should be restored after ArgvContext"
             )
 
-            # Verify the log file was created and contains the message
             assert logfile.exists(), "Log file should have been created"
             log_content = logfile.read_text()
             assert "Test message" in log_content, (
                 "Log file should contain the test message"
             )
 
     finally:
-        # Cleanup: Restore original handlers
         logging.root.handlers = original_handlers