rimport/test_get_staging_root: Use monkeypatch instead of patching os.environ.

Author: samsrabin

tests/rimport/test_get_staging_root.py

@@ -7,7 +7,6 @@
 import importlib.util
 from importlib.machinery import SourceFileLoader
 from pathlib import Path
-from unittest.mock import patch
 
 import pytest
 
@@ -48,62 +47,62 @@ def wrapper(*args, **kwargs):
 class TestGetStagingRoot:
     """Test suite for get_staging_root() function."""
 
-    def test_returns_default_when_env_not_set(self):
+    def test_returns_default_when_env_not_set(self, monkeypatch):
         """Test that default staging root is returned when RIMPORT_STAGING is not set."""
         # Ensure RIMPORT_STAGING is not set
-        with patch.dict(os.environ, {}, clear=True):
+        monkeypatch.delenv("RIMPORT_STAGING", raising=False)
 
-            result = rimport.get_staging_root()
+        result = rimport.get_staging_root()
 
-            assert result == rimport.DEFAULT_STAGING_ROOT
+        assert result == rimport.DEFAULT_STAGING_ROOT
 
-    def test_returns_env_value_when_set(self, tmp_path):
+    def test_returns_env_value_when_set(self, tmp_path, monkeypatch):
         """Test that RIMPORT_STAGING environment variable is used when set."""
         custom_staging = tmp_path / "custom_staging"
         custom_staging.mkdir()
 
-        with patch.dict(os.environ, {"RIMPORT_STAGING": str(custom_staging)}):
-            result = rimport.get_staging_root()
+        monkeypatch.setenv("RIMPORT_STAGING", str(custom_staging))
+        result = rimport.get_staging_root()
 
-            assert result == custom_staging.resolve()
+        assert result == custom_staging.resolve()
 
-    def test_expands_tilde_in_env_value(self):
+    def test_expands_tilde_in_env_value(self, monkeypatch):
         """Test that ~ is expanded in RIMPORT_STAGING value."""
         # Use a path with ~ that will be expanded
-        with patch.dict(os.environ, {"RIMPORT_STAGING": "~/my_staging"}):
-            result = rimport.get_staging_root()
+        monkeypatch.setenv("RIMPORT_STAGING", "~/my_staging")
+        result = rimport.get_staging_root()
 
-            # Should be expanded and resolved
-            assert "~" not in str(result)
-            assert result.is_absolute()
+        # Should be expanded and resolved
+        assert "~" not in str(result)
+        assert result.is_absolute()
 
-    def test_resolves_relative_path_in_env_value(self):
+    def test_resolves_relative_path_in_env_value(self, monkeypatch):
         """Test that relative paths in RIMPORT_STAGING are resolved."""
         # Set a relative path
-        with patch.dict(os.environ, {"RIMPORT_STAGING": "./staging"}):
-            result = rimport.get_staging_root()
+        monkeypatch.setenv("RIMPORT_STAGING", "./staging")
+        result = rimport.get_staging_root()
 
-            # Should be resolved to absolute path
-            assert result.is_absolute()
+        # Should be resolved to absolute path
+        assert result.is_absolute()
 
-    def test_env_value_with_spaces(self, tmp_path):
+    def test_env_value_with_spaces(self, tmp_path, monkeypatch):
         """Test handling of RIMPORT_STAGING with spaces in path."""
         custom_staging = tmp_path / "staging with spaces"
         custom_staging.mkdir()
 
-        with patch.dict(os.environ, {"RIMPORT_STAGING": str(custom_staging)}):
-            result = rimport.get_staging_root()
+        monkeypatch.setenv("RIMPORT_STAGING", str(custom_staging))
+        result = rimport.get_staging_root()
 
-            assert result == custom_staging.resolve()
+        assert result == custom_staging.resolve()
 
-    def test_env_value_overrides_default(self, tmp_path):
+    def test_env_value_overrides_default(self, tmp_path, monkeypatch):
         """Test that RIMPORT_STAGING overrides the default value."""
         custom_staging = tmp_path / "override"
         custom_staging.mkdir()
 
-        with patch.dict(os.environ, {"RIMPORT_STAGING": str(custom_staging)}):
-            result = rimport.get_staging_root()
+        monkeypatch.setenv("RIMPORT_STAGING", str(custom_staging))
+        result = rimport.get_staging_root()
 
-            # Should NOT be the default
-            assert result != rimport.DEFAULT_STAGING_ROOT
-            assert result == custom_staging.resolve()
+        # Should NOT be the default
+        assert result != rimport.DEFAULT_STAGING_ROOT
+        assert result == custom_staging.resolve()